X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Finterface.c;h=39ca880363aa96b2c888e25e53c49bc23cbad93a;hb=4e89060ceb1a14ec7f9abfe9caa6b0da7e76bd5c;hp=deba1860ec1f1dd7312932ff786168995830a992;hpb=3a9c4019736178fb78e65389acaf97c84cdc3086;p=collectd.git diff --git a/src/interface.c b/src/interface.c index deba1860..39ca8803 100644 --- a/src/interface.c +++ b/src/interface.c @@ -88,14 +88,17 @@ static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); static ignorelist_t *ignorelist = NULL; -static _Bool report_inactive = 1; +static bool report_inactive = true; #ifdef HAVE_LIBKSTAT +#if HAVE_KSTAT_H +#include +#endif #define MAX_NUMIF 256 extern kstat_ctl_t *kc; static kstat_t *ksp[MAX_NUMIF]; static int numif = 0; -static _Bool unique_name = 0; +static bool unique_name; #endif /* HAVE_LIBKSTAT */ static int interface_config(const char *key, const char *value) { @@ -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; } @@ -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; }