X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=e0c5116846cd5d5b3f2add69725118e21fd3f131;hb=f2f7049e8faff8043b12d7c7548d9398d3b3ada4;hp=139c97659a974701c2f69051c4d8fb93e78fc833;hpb=2cf10557f58144e13793a3d69ae5d4b7c8d6c305;p=collectd.git diff --git a/src/users.c b/src/users.c index 139c9765..e0c51168 100644 --- a/src/users.c +++ b/src/users.c @@ -3,7 +3,7 @@ * Copyright (C) 2005-2007 Sebastian Harl * Copyright (C) 2005 Niki W. Waibel * Copyright (C) 2005-2007 Florian octo Forster - * Copyright (C) 2008 Oleg King + * Copyright (C) 2008 Oleg King * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -26,6 +26,7 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -44,14 +45,10 @@ 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)); @@ -77,7 +74,7 @@ static int users_read (void) users_submit (users); /* #endif HAVE_GETUTXENT */ - + #elif HAVE_GETUTENT unsigned int users = 0; struct utmp *entry = NULL; @@ -106,7 +103,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