X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Futils%2Fcommon%2Fcommon.c;h=6a0ac28fe62b95c03db984ad92409c1e8e9113af;hb=8cae217ea6c6afc0a0eb6e4348b75293572109b5;hp=7cfd31096bb7f82d109b7905b0aa817593d4c90c;hpb=6b0e22a545bb3e4be1684a9fd6d2b48259ba9a7f;p=collectd.git diff --git a/src/utils/common/common.c b/src/utils/common/common.c index 7cfd3109..6a0ac28f 100644 --- a/src/utils/common/common.c +++ b/src/utils/common/common.c @@ -99,10 +99,7 @@ int ssnprintf(char *str, size_t sz, const char *format, ...) { va_end(ap); - if (ret < 0) { - return ret; - } - return (size_t)ret >= sz; + return ret; } /* int ssnprintf */ char *ssnprintf_alloc(char const *format, ...) /* {{{ */ @@ -1456,13 +1453,13 @@ int service_name_to_port_number(const char *service_name) { service_number = (int)ntohs(sa->sin6_port); } - if ((service_number > 0) && (service_number <= 65535)) + if (service_number > 0) 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 */