X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Finterface.c;h=5367ced3f7dc7794bd4e1694600066e437a3cc9e;hb=27ca3ca92a757b5c9bb3baa5a29ef352ec70b1c9;hp=3e2b2cd5fb99362a6b721e3f94ee92a219fbc996;hpb=7b0628b4f4688d48d89f94ca381ca6340da05b37;p=collectd.git diff --git a/src/interface.c b/src/interface.c index 3e2b2cd5..5367ced3 100644 --- a/src/interface.c +++ b/src/interface.c @@ -24,9 +24,9 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" -#include "utils_ignorelist.h" +#include "utils/common/common.h" +#include "utils/ignorelist/ignorelist.h" #if HAVE_SYS_TYPES_H #include @@ -86,7 +86,7 @@ static const char *config_keys[] = { }; static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); -static ignorelist_t *ignorelist = NULL; +static ignorelist_t *ignorelist; static bool report_inactive = true; @@ -97,7 +97,7 @@ static bool report_inactive = true; #define MAX_NUMIF 256 extern kstat_ctl_t *kc; static kstat_t *ksp[MAX_NUMIF]; -static int numif = 0; +static int numif; static bool unique_name; #endif /* HAVE_LIBKSTAT */ @@ -297,8 +297,8 @@ static int interface_read(void) { continue; if (unique_name) - snprintf(iname, sizeof(iname), "%s_%d_%s", ksp[i]->ks_module, - ksp[i]->ks_instance, ksp[i]->ks_name); + ssnprintf(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));