projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectctl: define LOCALSTATEDIR if not defined
[collectd.git]
/
src
/
uptime.c
diff --git
a/src/uptime.c
b/src/uptime.c
index
064c3ce
..
cbe2f8c
100644
(file)
--- a/
src/uptime.c
+++ b/
src/uptime.c
@@
-20,6
+20,7
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
@@
-179,17
+180,13
@@
static int uptime_init (void) /* {{{ */
/* #endif HAVE_LIBKSTAT */
# elif HAVE_SYS_SYSCTL_H
/* #endif HAVE_LIBKSTAT */
# elif HAVE_SYS_SYSCTL_H
- struct timeval boottv;
+ struct timeval boottv
= { 0 }
;
size_t boottv_len;
int status;
size_t boottv_len;
int status;
- int mib[2];
-
- mib[0] = CTL_KERN;
- mib[1] = KERN_BOOTTIME;
+ int mib[] = { CTL_KERN, KERN_BOOTTIME };
boottv_len = sizeof (boottv);
boottv_len = sizeof (boottv);
- memset (&boottv, 0, boottv_len);
status = sysctl (mib, STATIC_ARRAY_SIZE (mib), &boottv, &boottv_len,
/* new_value = */ NULL, /* new_length = */ 0);
status = sysctl (mib, STATIC_ARRAY_SIZE (mib), &boottv, &boottv_len,
/* new_value = */ NULL, /* new_length = */ 0);
@@
-241,7
+238,7
@@
static int uptime_read (void)
gauge_t uptime;
time_t elapsed;
gauge_t uptime;
time_t elapsed;
- /* calculate the am
m
ount of time elapsed since boot, AKA uptime */
+ /* calculate the amount of time elapsed since boot, AKA uptime */
elapsed = time (NULL) - boottime;
uptime = (gauge_t) elapsed;
elapsed = time (NULL) - boottime;
uptime = (gauge_t) elapsed;