Remove battery_power for various reasons

[slstatus.git] / components / uptime.c

diff --git a/components/uptime.c b/components/uptime.c
index 8a04b92..25f904c 100644 (file)
--- a/components/uptime.c
+++ b/components/uptime.c
@@ -1,45 +1,62 @@
 /* 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>

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

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

-const char *
-uptime(void)
-{
-       int h;
-       int m;
-       int uptime = 0;

 #if defined(__linux__)
 #if defined(__linux__)

-       struct sysinfo info;
+       #include <sys/sysinfo.h>
+
+       const char *
+       uptime(void)
+       {
+               int h;
+               int m;
+               int uptime = 0;
+               struct sysinfo info;
+
+               sysinfo(&info);
+               uptime = info.uptime;
+
+               h = uptime / 3600;
+               m = (uptime - h * 3600) / 60;

 
 

-       sysinfo(&info);
-       uptime = info.uptime;
+               return bprintf("%dh %dm", h, m);
+       }

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

-       int mib[2];
-       size_t size;
-       time_t now;
-       struct timeval boottime;
+       #include <sys/sysctl.h>
+       #include <sys/time.h>

 
 

-       time(&now);
+       const char *
+       uptime(void)
+       {
+               int h;
+               int m;
+               int uptime = 0;

 
 

-       mib[0] = CTL_KERN;
-       mib[1] = KERN_BOOTTIME;
+               int mib[2];
+               size_t size;
+               time_t now;
+               struct timeval boottime;

 
 

-       size = sizeof(boottime);
+               time(&now);

 
 

-       if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
-               uptime = now - boottime.tv_sec;
-       else
-               return NULL;
-#endif
-       h = uptime / 3600;
-       m = (uptime - h * 3600) / 60;
+               mib[0] = CTL_KERN;
+               mib[1] = KERN_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;
+               }

 
 

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