Add warn() and die()

[slstatus.git] / components / uptime.c

diff --git a/components/uptime.c b/components/uptime.c
index debe4cb..45e12db 100644 (file)
--- a/components/uptime.c
+++ b/components/uptime.c
@@ -1,63 +1,61 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include <errno.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <string.h>
-#if defined(__linux__)
-#include <sys/sysinfo.h>
-#elif defined(__OpenBSD__)
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#endif

 
 #include "../util.h"
 
 
 #include "../util.h"
 

-#if defined(__linux__)

 const char *
 const char *

-uptime(void)
+format(int uptime)

 {
 {

-       int h;
-       int m;
-       int uptime = 0;
-       struct sysinfo info;
-
-       sysinfo(&info);
-       uptime = info.uptime;
+       int h, m;

 
        h = uptime / 3600;
        m = (uptime - h * 3600) / 60;
 
        return bprintf("%dh %dm", h, m);
 }
 
        h = uptime / 3600;
        m = (uptime - h * 3600) / 60;
 
        return bprintf("%dh %dm", h, m);
 }

+
+#if defined(__linux__)
+       #include <sys/sysinfo.h>
+
+       const char *
+       uptime(void)
+       {
+               int uptime;
+               struct sysinfo info;
+
+               sysinfo(&info);
+               uptime = info.uptime;
+
+               return format(uptime);
+       }

 #elif defined(__OpenBSD__)
 #elif defined(__OpenBSD__)

-const char *
-uptime(void)
-{
-       int h;
-       int m;
-       int uptime = 0;
+       #include <errno.h>
+       #include <string.h>
+       #include <sys/sysctl.h>
+       #include <sys/time.h>

 
 

-       int mib[2];
-       size_t size;
-       time_t now;
-       struct timeval boottime;
+       const char *
+       uptime(void)
+       {
+               int mib[2], uptime;
+               size_t size;
+               time_t now;
+               struct timeval boottime;

 
 

-       time(&now);
+               time(&now);

 
 

-       mib[0] = CTL_KERN;
-       mib[1] = KERN_BOOTTIME;
+               mib[0] = CTL_KERN;
+               mib[1] = KERN_BOOTTIME;

 
 

-       size = sizeof(boottime);
+               size = sizeof(boottime);

 
 

-       if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
-               uptime = now - boottime.tv_sec;
-       else {
-               fprintf(stderr, "sysctl 'KERN_BOOTTIME': %s\n", strerror(errno));
-               return NULL;
-       }
+               if (sysctl(mib, 2, &boottime, &size, NULL, 0) < 0) {
+                       warn("sysctl 'KERN_BOOTTIME':");
+                       return NULL;
+               }

 
 

-       h = uptime / 3600;
-       m = (uptime - h * 3600) / 60;
+               uptime = now - boottime.tv_sec;

 
 

-       return bprintf("%dh %dm", h, m);
-}
+               return format(uptime);
+       }

 #endif
 #endif