X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Finterface.c;h=c45ef6603b79c51e1cbfdc4f7aa04ea9dc7d0e52;hb=849f5394cce97a76da080f6cd9e5194b7f4ee0f0;hp=78a0d694fe18efdd0a5ac4640d157d745062abaf;hpb=867ad628dc6fcd05bd584b605d7093cfc00c3d07;p=collectd.git diff --git a/src/interface.c b/src/interface.c index 78a0d694..c45ef660 100644 --- a/src/interface.c +++ b/src/interface.c @@ -91,6 +91,9 @@ static ignorelist_t *ignorelist = NULL; static _Bool report_inactive = 1; #ifdef HAVE_LIBKSTAT +#if HAVE_KSTAT_H +#include +#endif #define MAX_NUMIF 256 extern kstat_ctl_t *kc; static kstat_t *ksp[MAX_NUMIF]; @@ -236,9 +239,7 @@ static int interface_read(void) { int numfields; if ((fh = fopen("/proc/net/dev", "r")) == NULL) { - char errbuf[1024]; - WARNING("interface plugin: fopen: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("interface plugin: fopen: %s", STRERRNO); return -1; } @@ -296,8 +297,8 @@ static int interface_read(void) { continue; if (unique_name) - ssnprintf(iname, sizeof(iname), "%s_%d_%s", ksp[i]->ks_module, - ksp[i]->ks_instance, ksp[i]->ks_name); + snprintf(iname, sizeof(iname), "%s_%d_%s", ksp[i]->ks_module, + ksp[i]->ks_instance, ksp[i]->ks_name); else sstrncpy(iname, ksp[i]->ks_name, sizeof(iname)); @@ -352,9 +353,7 @@ static int interface_read(void) { if ((nif = perfstat_netinterface(NULL, NULL, sizeof(perfstat_netinterface_t), 0)) < 0) { - char errbuf[1024]; - WARNING("interface plugin: perfstat_netinterface: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("interface plugin: perfstat_netinterface: %s", STRERRNO); return -1; } @@ -367,9 +366,8 @@ static int interface_read(void) { id.name[0] = '\0'; if ((ifs = perfstat_netinterface(&id, ifstat, sizeof(perfstat_netinterface_t), nif)) < 0) { - char errbuf[1024]; WARNING("interface plugin: perfstat_netinterface (interfaces=%d): %s", nif, - sstrerror(errno, errbuf, sizeof(errbuf))); + STRERRNO); return -1; }