cpu: Use uint64_t on OpenBSD

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index 5d7a385..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,19 +8,17 @@
        #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 *
        static const char *

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

        {
        {

-               if (esnprintf(path, length, f1, bat) > 0 && access(path, R_OK) == 0) {
+               if (esnprintf(path, length, f1, bat) > 0 &&
+                   access(path, R_OK) == 0) {

                        return f1;
                }
 
                        return f1;
                }
 

-               if (esnprintf(path, length, f2, bat) > 0 && access(path, R_OK) == 0) {
+               if (esnprintf(path, length, f2, bat) > 0 &&
+                   access(path, R_OK) == 0) {

                        return f2;
                }
 
                        return f2;
                }
 


@@ -43,7 +40,7 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               return bprintf("%d%%", perc);
+               return bprintf("%d", perc);

        }
 
        const char *
        }
 
        const char *


@@ -80,7 +77,7 @@
        battery_remaining(const char *bat)
        {
                int charge_now, current_now, m, h;
        battery_remaining(const char *bat)
        {
                int charge_now, current_now, m, h;

-               float timeleft;
+               double timeleft;

                char path[PATH_MAX], state[12];
 
                if (esnprintf(path, sizeof(path),
                char path[PATH_MAX], state[12];
 
                if (esnprintf(path, sizeof(path),


@@ -92,20 +89,28 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               if (pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof (path)) == NULL ||
+               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, sizeof (path)) == NULL ||
+                       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;
                        }
 
                            pscanf(path, "%d", &current_now) < 0) {
                                return NULL;
                        }
 

-                       timeleft = (float)charge_now / (float)current_now;
+                       if (current_now == 0) {
+                               return NULL;
+                       }
+
+                       timeleft = (double)charge_now / (double)current_now;

                        h = timeleft;
                        h = timeleft;

-                       m = (timeleft - (float)h) * 60;
+                       m = (timeleft - (double)h) * 60;

 
                        return bprintf("%dh %dm", h, m);
                }
 
                        return bprintf("%dh %dm", h, m);
                }


@@ -144,7 +149,7 @@
                struct apm_power_info apm_info;
 
                if (load_apm_power_info(&apm_info)) {
                struct apm_power_info apm_info;
 
                if (load_apm_power_info(&apm_info)) {

-                       return bprintf("%d%%", apm_info.battery_life);
+                       return bprintf("%d", apm_info.battery_life);

                }
 
                return NULL;
                }
 
                return NULL;


@@ -182,7 +187,8 @@
 
                if (load_apm_power_info(&apm_info)) {
                        if (apm_info.ac_state != APM_AC_ON) {
 
                if (load_apm_power_info(&apm_info)) {
                        if (apm_info.ac_state != APM_AC_ON) {

-                               return bprintf("%uh %02um", apm_info.minutes_left / 60,
+                               return bprintf("%uh %02um",
+                                              apm_info.minutes_left / 60,

                                               apm_info.minutes_left % 60);
                        } else {
                                return "";
                                               apm_info.minutes_left % 60);
                        } else {
                                return "";