projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectd-tg: Fix unintentional cast from double to time_t.
[collectd.git]
/
src
/
users.c
diff --git
a/src/users.c
b/src/users.c
index
b605ff8
..
139c976
100644
(file)
--- a/
src/users.c
+++ b/
src/users.c
@@
-1,6
+1,9
@@
/**
* collectd - src/users.c
* Copyright (C) 2005-2007 Sebastian Harl
/**
* collectd - src/users.c
* Copyright (C) 2005-2007 Sebastian Harl
+ * Copyright (C) 2005 Niki W. Waibel
+ * Copyright (C) 2005-2007 Florian octo Forster
+ * 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
*
* 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
@@
-17,6
+20,9
@@
*
* Authors:
* Sebastian Harl <sh at tokkee.org>
*
* Authors:
* Sebastian Harl <sh at tokkee.org>
+ * Niki W. Waibel <niki.waibel at newlogic.com>
+ * Florian octo Forster <octo at collectd.org>
+ * Oleg King <king2 at kaluga.ru>
**/
#include "collectd.h"
**/
#include "collectd.h"
@@
-34,9
+40,6
@@
#elif HAVE_UTMP_H
# include <utmp.h>
/* #endif HAVE_UTMP_H */
#elif HAVE_UTMP_H
# include <utmp.h>
/* #endif HAVE_UTMP_H */
-
-#else
-# error "No applicable input method."
#endif
static void users_submit (gauge_t value)
#endif
static void users_submit (gauge_t value)
@@
-96,11
+99,21
@@
static int users_read (void)
#elif HAVE_LIBSTATGRAB
sg_user_stats *us;
#elif HAVE_LIBSTATGRAB
sg_user_stats *us;
+# if HAVE_LIBSTATGRAB_0_90
+ size_t num_entries;
+ us = sg_get_user_stats (&num_entries);
+# else
us = sg_get_user_stats ();
us = sg_get_user_stats ();
+# endif
if (us == NULL)
return (-1);
if (us == NULL)
return (-1);
- users_submit ((gauge_t) us->num_entries);
+ users_submit ((gauge_t)
+# if HAVE_LIBSTATGRAB_0_90
+ num_entries);
+# else
+ us->num_entries);
+# endif
/* #endif HAVE_LIBSTATGRAB */
#else
/* #endif HAVE_LIBSTATGRAB */
#else