X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=afe26e1e27fc27a3d155b135b56d3571290bcd46;hb=83149d73b8a3bd4889517a2e4d0adca0a52e7a06;hp=db75565dd202aaa4a2cd56aa3934ce96d4ac409e;hpb=44ac0e1f1041655e0615c7475d0f592e6ab91629;p=collectd.git

diff --git a/src/users.c b/src/users.c
index db75565d..afe26e1e 100644
--- a/src/users.c
+++ b/src/users.c
@@ -4,8 +4,7 @@
  *
  * 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
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the license is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,38 +25,21 @@
 
 #if HAVE_UTMPX_H
 # include <utmpx.h>
-#else /* !HAVE_UTMPX_H */
-# if HAVE_UTMP_H
-#  include <utmp.h>
-# endif /* HAVE_UTMP_H */
-#endif /* HAVE_UTMPX_H */
+/* #endif HAVE_UTMPX_H */
 
-#define MODULE_NAME "users"
+#elif HAVE_UTMP_H
+# include <utmp.h>
+/* #endif HAVE_UTMP_H */
 
-#if HAVE_GETUTXENT || HAVE_GETUTENT
-# define USERS_HAVE_READ 1
 #else
-# define USERS_HAVE_READ 0
+# error "No applicable input method."
 #endif
 
-static data_source_t dsrc[1] =
-{
-	{"users",  DS_TYPE_GAUGE, 0.0, 65535.0}
-};
-
-static data_set_t ds =
-{
-	"users", 1, dsrc
-};
-
-#if USERS_HAVE_READ
 static void users_submit (gauge_t value)
 {
 	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	DBG ("value = %lf;", value);
-
 	values[0].gauge = value;
 
 	vl.values = values;
@@ -105,15 +87,16 @@ static int users_read (void)
 	endutent();
 
 	users_submit (users);
-#endif /* HAVE_GETUTENT */
+/* #endif HAVE_GETUTENT */
+
+#else
+# error "No applicable input method."
+#endif
 
 	return (0);
 } /* int users_read */
-#endif /* USERS_HAVE_READ */
 
 void module_register (void)
 {
-	plugin_register_data_set (&ds);
 	plugin_register_read ("users", users_read);
-	return;
 } /* void module_register(void) */