X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=fc03ba2ce1e3f0d50ff45d9d43c30e6da5da07c5;hb=eada465ff40eb2ecaef17490e5462dab3b8874fe;hp=1ae128e14ca6119b30e3cb881642c28a0e226a43;hpb=2079ee1517e34de372f58e7e2267ad5c71a8a41f;p=collectd.git diff --git a/src/users.c b/src/users.c index 1ae128e1..fc03ba2c 100644 --- a/src/users.c +++ b/src/users.c @@ -27,8 +27,8 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" #if HAVE_STATGRAB_H #include @@ -44,14 +44,10 @@ #endif static void users_submit(gauge_t value) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].gauge = value; - - vl.values = values; + vl.values = &(value_t){.gauge = value}; vl.values_len = 1; - sstrncpy(vl.host, hostname_g, sizeof(vl.host)); sstrncpy(vl.plugin, "users", sizeof(vl.plugin)); sstrncpy(vl.type, "users", sizeof(vl.plugin)); @@ -105,7 +101,7 @@ static int users_read(void) { us = sg_get_user_stats(); #endif if (us == NULL) - return (-1); + return -1; users_submit((gauge_t) #if HAVE_LIBSTATGRAB_0_90 @@ -119,7 +115,7 @@ static int users_read(void) { #error "No applicable input method." #endif - return (0); + return 0; } /* int users_read */ void module_register(void) {