projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix conflict from remove of ssnprintf2 and align utils/common/common.h
[collectd.git]
/
src
/
utils
/
common
/
common.c
diff --git
a/src/utils/common/common.c
b/src/utils/common/common.c
index
8b2521d
..
aad767e
100644
(file)
--- a/
src/utils/common/common.c
+++ b/
src/utils/common/common.c
@@
-89,8
+89,7
@@
char *sstrncpy(char *dest, const char *src, size_t n) {
return dest;
} /* char *sstrncpy */
return dest;
} /* char *sstrncpy */
-/* ssnprintf returns zero on success, one if truncation occurred
- and a negative integer onerror. */
+/* ssnprintf returns result from vsnprintf conistent with snprintf */
int ssnprintf(char *str, size_t sz, const char *format, ...) {
va_list ap;
va_start(ap, format);
int ssnprintf(char *str, size_t sz, const char *format, ...) {
va_list ap;
va_start(ap, format);
@@
-1453,13
+1452,13
@@
int service_name_to_port_number(const char *service_name) {
service_number = (int)ntohs(sa->sin6_port);
}
service_number = (int)ntohs(sa->sin6_port);
}
- if (
(service_number > 0) && (service_number <= 65535)
)
+ if (
service_number > 0
)
break;
}
freeaddrinfo(ai_list);
break;
}
freeaddrinfo(ai_list);
- if (
(service_number > 0) && (service_number <= 65535)
)
+ if (
service_number > 0
)
return service_number;
return -1;
} /* int service_name_to_port_number */
return service_number;
return -1;
} /* int service_name_to_port_number */