X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fusers.c;h=139c97659a974701c2f69051c4d8fb93e78fc833;hb=6f4f918d4d5e70c75471632254ecb9c55fd8d62f;hp=10f34ee9483023959cc129c6e53a7e29e18e18c5;hpb=e5980bd18554dc9472c49a12196a9d8f45a4bcf6;p=collectd.git diff --git a/src/users.c b/src/users.c index 10f34ee9..ce626ae3 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" @@ -40,19 +41,13 @@ #elif HAVE_UTMP_H # include /* #endif HAVE_UTMP_H */ - -#else -# error "No applicable input method." #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)); @@ -80,7 +75,7 @@ static int users_read (void) users_submit (users); /* #endif HAVE_GETUTXENT */ - + #elif HAVE_GETUTENT unsigned int users = 0; struct utmp *entry = NULL; @@ -109,7 +104,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