X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Finterface.c;h=0e1397089cb41d177620f4c755320bef6c0ffede;hb=6378ec288f34ff250b2971a1452338a2b34c240a;hp=c45ef6603b79c51e1cbfdc4f7aa04ea9dc7d0e52;hpb=a4db31342f22ac33831874bab420831b25d31d66;p=collectd.git diff --git a/src/interface.c b/src/interface.c index c45ef660..0e139708 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,9 +86,9 @@ 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 = 1; +static bool report_inactive = true; #ifdef HAVE_LIBKSTAT #if HAVE_KSTAT_H @@ -97,8 +97,8 @@ static _Bool report_inactive = 1; #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 int numif; +static bool unique_name; #endif /* HAVE_LIBKSTAT */ static int interface_config(const char *key, const char *value) { @@ -117,7 +117,7 @@ static int interface_config(const char *key, const char *value) { else if (strcasecmp(key, "UniqueName") == 0) { #ifdef HAVE_LIBKSTAT if (IS_TRUE(value)) - unique_name = 1; + unique_name = true; #else WARNING("interface plugin: the \"UniqueName\" option is only valid on " "Solaris.");