X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fuptime.c;h=2be9d79da0d793af64685c8171da2a29887b5edd;hb=4380983e0a45e2d1c1207dbea95863d1dcc844c6;hp=96a227d99afd54434b6fe9f88841ab3c820b017c;hpb=eec0cd9ca51c5c132ed09fc4699c02f3bd12d748;p=collectd.git diff --git a/src/uptime.c b/src/uptime.c index 96a227d9..2be9d79d 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -99,7 +99,7 @@ static int uptime_init(void) /* {{{ */ char errbuf[1024]; ERROR("uptime plugin: Cannot open " STAT_FILE ": %s", sstrerror(errno, errbuf, sizeof(errbuf))); - return (-1); + return -1; } while (fgets(buffer, 1024, fh) != NULL) { @@ -116,7 +116,7 @@ static int uptime_init(void) /* {{{ */ /* loop done, check if no value has been found/read */ if (ret != 1) { ERROR("uptime plugin: No value read from " STAT_FILE ""); - return (-1); + return -1; } boottime = (time_t)starttime; @@ -124,7 +124,7 @@ static int uptime_init(void) /* {{{ */ if (boottime == 0) { ERROR("uptime plugin: btime read from " STAT_FILE ", " "but `boottime' is zero!"); - return (-1); + return -1; } /* #endif KERNEL_LINUX */ @@ -139,24 +139,24 @@ static int uptime_init(void) /* {{{ */ * went fine. */ if (kc == NULL) { ERROR("uptime plugin: kstat chain control structure not available."); - return (-1); + return -1; } ksp = kstat_lookup(kc, "unix", 0, "system_misc"); if (ksp == NULL) { ERROR("uptime plugin: Cannot find unix:0:system_misc kstat."); - return (-1); + return -1; } if (kstat_read(kc, ksp, NULL) < 0) { ERROR("uptime plugin: kstat_read failed."); - return (-1); + return -1; } knp = (kstat_named_t *)kstat_data_lookup(ksp, "boot_time"); if (knp == NULL) { ERROR("uptime plugin: kstat_data_lookup (boot_time) failed."); - return (-1); + return -1; } boottime = (time_t)knp->value.ui32; @@ -164,7 +164,7 @@ static int uptime_init(void) /* {{{ */ if (boottime == 0) { ERROR("uptime plugin: kstat_data_lookup returned success, " "but `boottime' is zero!"); - return (-1); + return -1; } /* #endif HAVE_LIBKSTAT */ @@ -183,7 +183,7 @@ static int uptime_init(void) /* {{{ */ char errbuf[1024]; ERROR("uptime plugin: No value read from sysctl interface: %s", sstrerror(errno, errbuf, sizeof(errbuf))); - return (-1); + return -1; } boottime = boottv.tv_sec; @@ -191,7 +191,7 @@ static int uptime_init(void) /* {{{ */ if (boottime == 0) { ERROR("uptime plugin: sysctl(3) returned success, " "but `boottime' is zero!"); - return (-1); + return -1; } /* #endif HAVE_SYS_SYSCTL_H */ @@ -205,7 +205,7 @@ static int uptime_init(void) /* {{{ */ char errbuf[1024]; ERROR("uptime plugin: perfstat_cpu_total: %s", sstrerror(errno, errbuf, sizeof(errbuf))); - return (-1); + return -1; } hertz = sysconf(_SC_CLK_TCK); @@ -215,7 +215,7 @@ static int uptime_init(void) /* {{{ */ boottime = time(NULL) - cputotal.lbolt / hertz; #endif /* HAVE_PERFSTAT */ - return (0); + return 0; } /* }}} int uptime_init */ static int uptime_read(void) { @@ -229,7 +229,7 @@ static int uptime_read(void) { uptime_submit(uptime); - return (0); + return 0; } void module_register(void) {