Merge branch 'collectd-3.11' into collectd-4.0

[collectd.git] / src / users.c

diff --git a/src/users.c b/src/users.c
index 03d6148..7df06c2 100644 (file)
--- 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
@@ -40,16 +39,6 @@
 # define USERS_HAVE_READ 0
 #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)
 {
@@ -111,7 +100,7 @@ static int users_read (void)
 
 void module_register (void)
 {
-       plugin_register_data_set (&ds);
+#if USERS_HAVE_READ
        plugin_register_read ("users", users_read);
-       return;
+#endif
 } /* void module_register(void) */