X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetlink.c;h=8f45ea2e79334927b3b29942a3f33296bb9f2a6e;hb=b72d521340383b6418fa6a75faca3bc45f06b14a;hp=f597b01d3243b5ad890b5e096b51ebca2273841b;hpb=bab707fe46b2ef69f391864f3bb08b4dca19634e;p=collectd.git diff --git a/src/netlink.c b/src/netlink.c index f597b01d..8f45ea2e 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -170,9 +170,8 @@ static void submit_one (const char *dev, const char *type, vl.values = values; vl.values_len = 1; - vl.time = time (NULL); - strcpy (vl.host, hostname_g); - strcpy (vl.plugin, "netlink"); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "netlink", sizeof (vl.plugin)); sstrncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance)); sstrncpy (vl.type, type, sizeof (vl.type)); @@ -194,9 +193,8 @@ static void submit_two (const char *dev, const char *type, vl.values = values; vl.values_len = 2; - vl.time = time (NULL); - strcpy (vl.host, hostname_g); - strcpy (vl.plugin, "netlink"); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "netlink", sizeof (vl.plugin)); sstrncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance)); sstrncpy (vl.type, type, sizeof (vl.type)); @@ -206,8 +204,8 @@ static void submit_two (const char *dev, const char *type, plugin_dispatch_values (&vl); } /* void submit_two */ -static int link_filter (const struct sockaddr_nl *sa, - const struct nlmsghdr *nmh, void *args) +static int link_filter (const struct sockaddr_nl __attribute__((unused)) *sa, + struct nlmsghdr *nmh, void __attribute__((unused)) *args) { struct ifinfomsg *msg; int msg_len; @@ -316,8 +314,8 @@ static int link_filter (const struct sockaddr_nl *sa, return (0); } /* int link_filter */ -static int qos_filter (const struct sockaddr_nl *sa, - const struct nlmsghdr *nmh, void *args) +static int qos_filter (const struct sockaddr_nl __attribute__((unused)) *sa, + struct nlmsghdr *nmh, void *args) { struct tcmsg *msg; int msg_len; @@ -364,7 +362,7 @@ static int qos_filter (const struct sockaddr_nl *sa, if (msg->tcm_ifindex >= iflist_len) { ERROR ("netlink plugin: qos_filter: msg->tcm_ifindex = %i " - ">= iflist_len = %i", + ">= iflist_len = %zu", msg->tcm_ifindex, iflist_len); return (-1); }