cpu: Use uint64_t on OpenBSD

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index fa525be..82e0baf 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include <errno.h>

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


@@ -9,11 +8,6 @@
        #include <limits.h>
        #include <unistd.h>
 
        #include <limits.h>
        #include <unistd.h>
 

-       #define CHARGE_NOW "/sys/class/power_supply/%s/charge_now"
-       #define ENERGY_NOW "/sys/class/power_supply/%s/energy_now"
-       #define CURRENT_NOW "/sys/class/power_supply/%s/current_now"
-       #define POWER_NOW "/sys/class/power_supply/%s/power_now"
-

        static const char *
        pick(const char *bat, const char *f1, const char *f2, char *path,
             size_t length)
        static const char *
        pick(const char *bat, const char *f1, const char *f2, char *path,
             size_t length)


@@ -95,18 +89,25 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               if (!pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof(path)) ||
+               if (!pick(bat, "/sys/class/power_supply/%s/charge_now",
+                         "/sys/class/power_supply/%s/energy_now",
+                         path, sizeof(path)) ||

                    pscanf(path, "%d", &charge_now) < 0) {
                        return NULL;
                }
 
                if (!strcmp(state, "Discharging")) {
                    pscanf(path, "%d", &charge_now) < 0) {
                        return NULL;
                }
 
                if (!strcmp(state, "Discharging")) {

-                       if (!pick(bat, CURRENT_NOW, POWER_NOW, path,
+                       if (!pick(bat, "/sys/class/power_supply/%s/current_now",
+                                 "/sys/class/power_supply/%s/power_now", path,

                                  sizeof(path)) ||
                            pscanf(path, "%d", &current_now) < 0) {
                                return NULL;
                        }
 
                                  sizeof(path)) ||
                            pscanf(path, "%d", &current_now) < 0) {
                                return NULL;
                        }
 

+                       if (current_now == 0) {
+                               return NULL;
+                       }
+

                        timeleft = (double)charge_now / (double)current_now;
                        h = timeleft;
                        m = (timeleft - (double)h) * 60;
                        timeleft = (double)charge_now / (double)current_now;
                        h = timeleft;
                        m = (timeleft - (double)h) * 60;