projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.0'
[collectd.git]
/
src
/
users.c
diff --git
a/src/users.c
b/src/users.c
index
e600aab
..
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
*
* 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
*
* 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
# 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)
{
#if USERS_HAVE_READ
static void users_submit (gauge_t value)
{
@@
-109,13
+98,9
@@
static int users_read (void)
} /* int users_read */
#endif /* USERS_HAVE_READ */
} /* int users_read */
#endif /* USERS_HAVE_READ */
-void module_register (
modreg_e loa
d)
+void module_register (
voi
d)
{
{
- if (load & MR_DATASETS)
- plugin_register_data_set (&ds);
-
#if USERS_HAVE_READ
#if USERS_HAVE_READ
- if (load & MR_READ)
- plugin_register_read ("users", users_read);
+ plugin_register_read ("users", users_read);
#endif
} /* void module_register(void) */
#endif
} /* void module_register(void) */