X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fcgroups.c;h=8925239848f0ba2af42d50e92b6a5224fc050540;hp=5830c7ba281e5ba955361c9a6bfe9051aafa43cf;hb=a59c14adfa86c823efff87ca797c4d6e6ce32913;hpb=7b0628b4f4688d48d89f94ca381ca6340da05b37 diff --git a/src/cgroups.c b/src/cgroups.c index 5830c7ba..89252398 100644 --- a/src/cgroups.c +++ b/src/cgroups.c @@ -23,15 +23,15 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" -#include "utils_ignorelist.h" -#include "utils_mount.h" +#include "utils/common/common.h" +#include "utils/ignorelist/ignorelist.h" +#include "utils/mount/mount.h" static char const *config_keys[] = {"CGroup", "IgnoreSelected"}; static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); -static ignorelist_t *il_cgroup = NULL; +static ignorelist_t *il_cgroup; __attribute__((nonnull(1))) __attribute__((nonnull(2))) static void cgroups_submit_one(char const *plugin_instance, char const *type_instance, @@ -112,7 +112,7 @@ static int read_cpuacct_procs(const char *dirname, char const *cgroup_name, /* Strip colon off the first column, if found */ if (key[key_len - 1] == ':') - key[key_len - 1] = 0; + key[key_len - 1] = '\0'; status = parse_value(fields[1], &value, DS_TYPE_DERIVE); if (status != 0)