X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Finterface.c;h=f17dbc4a685a8f7cc46e58b4f6baf7fd36ac2557;hb=abaa1c8a24e8eff5632dd6052b1da5f6535caf19;hp=3e2b2cd5fb99362a6b721e3f94ee92a219fbc996;hpb=6e41c3b1f024d7944e5e8010a87933555c662474;p=collectd.git diff --git a/src/interface.c b/src/interface.c index 3e2b2cd5..f17dbc4a 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,7 +297,7 @@ static int interface_read(void) { continue; if (unique_name) - snprintf(iname, sizeof(iname), "%s_%d_%s", ksp[i]->ks_module, + 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));