X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftcpconns.c;h=d01bcd2363e9692ef3a248209592cd789b24b37f;hb=c4439c9cb3e2348ad7013644731de27a55eca478;hp=90dedce4dfe488bed5c7f37a60129690c725a5c3;hpb=38e94dcc796e5d00088826ffd5d43ca5a2e590a2;p=collectd.git diff --git a/src/tcpconns.c b/src/tcpconns.c index 90dedce4..d01bcd23 100644 --- a/src/tcpconns.c +++ b/src/tcpconns.c @@ -59,8 +59,8 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" #if defined(__OpenBSD__) #define HAVE_KVM_GETFILES 1 @@ -498,7 +498,6 @@ static int conn_read_netlink(void) { iov.iov_len = sizeof(buf); while (1) { - int status; struct nlmsghdr *h; memset(&msg, 0, sizeof(msg)); @@ -507,7 +506,7 @@ static int conn_read_netlink(void) { msg.msg_iov = &iov; msg.msg_iovlen = 1; - status = recvmsg(fd, (void *)&msg, /* flags = */ 0); + ssize_t status = recvmsg(fd, (void *)&msg, /* flags = */ 0); if (status < 0) { if ((errno == EINTR) || (errno == EAGAIN)) continue; @@ -574,11 +573,11 @@ static int conn_handle_line(char *buffer) { uint8_t state; - int buffer_len = strlen(buffer); + size_t buffer_len = strlen(buffer); while ((buffer_len > 0) && (buffer[buffer_len - 1] < 32)) buffer[--buffer_len] = '\0'; - if (buffer_len <= 0) + if (buffer_len == 0) return -1; fields_len = strsplit(buffer, fields, STATIC_ARRAY_SIZE(fields));