From: Costa Tsaousis (ktsaou) Date: Sun, 15 Jan 2017 04:48:30 +0000 (+0200) Subject: fixes suggested by coverity X-Git-Tag: v1.5.0~19^2~8 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a33ceed418e85b9a996c132da9143a8c048e4bb7;p=netdata.git fixes suggested by coverity --- diff --git a/src/plugin_proc_diskspace.c b/src/plugin_proc_diskspace.c index eb6da1f3..b0453a20 100644 --- a/src/plugin_proc_diskspace.c +++ b/src/plugin_proc_diskspace.c @@ -186,7 +186,6 @@ void *proc_diskspace_main(void *ptr) { check_for_new_mountpoints_every = update_every; RRDSET *stcpu_thread = NULL, *st_duration = NULL; - RRDDIM *rd_user = NULL, *rd_system = NULL, *rd_duration = NULL; struct rusage thread; usec_t last = 0, dt = 0; @@ -242,15 +241,15 @@ void *proc_diskspace_main(void *ptr) { , "NetData Disk Space Plugin CPU usage", "milliseconds/s", 132020 , update_every, RRDSET_TYPE_STACKED); - rd_user = rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL); - rd_system = rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL); + rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL); + rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL); } } else rrdset_next(stcpu_thread); - rrddim_set_by_pointer(stcpu_thread, rd_user, thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec); - rrddim_set_by_pointer(stcpu_thread, rd_system, thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec); + rrddim_set(stcpu_thread, "user", thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec); + rrddim_set(stcpu_thread, "system", thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec); rrdset_done(stcpu_thread); // ---------------------------------------------------------------- @@ -262,13 +261,13 @@ void *proc_diskspace_main(void *ptr) { , "NetData Disk Space Plugin Duration", "milliseconds/run", 132021 , update_every, RRDSET_TYPE_AREA); - rd_duration = rrddim_add(st_duration, "duration", NULL, 1, 1000, RRDDIM_ABSOLUTE); + rrddim_add(st_duration, "duration", NULL, 1, 1000, RRDDIM_ABSOLUTE); } } else rrdset_next(st_duration); - rrddim_set_by_pointer(st_duration, rd_duration, dt); + rrddim_set(st_duration, "duration", dt); rrdset_done(st_duration); // ---------------------------------------------------------------- diff --git a/src/sys_fs_cgroup.c b/src/sys_fs_cgroup.c index af945daf..ebbd8eb7 100644 --- a/src/sys_fs_cgroup.c +++ b/src/sys_fs_cgroup.c @@ -1546,7 +1546,7 @@ void *cgroups_main(void *ptr) { struct rusage thread; // when ZERO, attempt to do it - int vdo_cpu_netdata = config_get_boolean("plugin:cgroups", "cgroups plugin resources", 1); + int vdo_cpu_netdata = config_get_boolean("plugin:cgroups", "cgroups plugin resource charts", 1); read_cgroup_plugin_configuration();