X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fipvs.c;h=4345a46532237081bcd8ff075102e6d34635f4a7;hb=eb2f3a4bdc78e1e2c4191b4e08d75d5eeea8be0e;hp=cbb554286bd08f292219ff91b8a81a601925638d;hpb=81a5fd5046c6a39f580a8fc1a3af837fd5f5aa5c;p=collectd.git diff --git a/src/ipvs.c b/src/ipvs.c index cbb55428..4345a465 100644 --- a/src/ipvs.c +++ b/src/ipvs.c @@ -37,9 +37,6 @@ #if HAVE_ARPA_INET_H # include #endif /* HAVE_ARPA_INET_H */ -#if HAVE_SYS_SOCKET_H -# include -#endif /* HAVE_SYS_SOCKET_H */ #if HAVE_NETINET_IN_H # include #endif /* HAVE_NETINET_IN_H */ @@ -197,7 +194,7 @@ static int get_pi (struct ip_vs_service_entry *se, char *pi, size_t size) (se->protocol == IPPROTO_TCP) ? "TCP" : "UDP", ntohs (se->port)); - if ((0 > len) || (size <= len)) { + if ((0 > len) || (size <= ((size_t) len))) { log_err ("plugin instance truncated: %s", pi); return -1; } @@ -220,7 +217,7 @@ static int get_ti (struct ip_vs_dest_entry *de, char *ti, size_t size) len = ssnprintf (ti, size, "%s_%u", inet_ntoa (addr), ntohs (de->port)); - if ((0 > len) || (size <= len)) { + if ((0 > len) || (size <= ((size_t) len))) { log_err ("type instance truncated: %s", ti); return -1; } @@ -292,7 +289,7 @@ static void cipvs_submit_service (struct ip_vs_service_entry *se) char pi[DATA_MAX_NAME_LEN]; - int i = 0; + size_t i; if (0 != get_pi (se, pi, sizeof (pi))) { @@ -314,7 +311,7 @@ static void cipvs_submit_service (struct ip_vs_service_entry *se) static int cipvs_read (void) { struct ip_vs_get_services *services = NULL; - int i = 0; + size_t i; if (sockfd < 0) return (-1);