ram: Consistency with line breaks

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index 6105a37..1178f20 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -7,13 +6,9 @@
 
 #if defined(__linux__)
        #include <limits.h>
+       #include <stdint.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)
@@ -38,8 +33,7 @@
                char path[PATH_MAX];
 
                if (esnprintf(path, sizeof(path),
-                             "/sys/class/power_supply/%s/capacity",
-                             bat) < 0) {
+                             "/sys/class/power_supply/%s/capacity", bat) < 0) {
                        return NULL;
                }
                if (pscanf(path, "%d", &perc) != 1) {
@@ -63,8 +57,7 @@
                char path[PATH_MAX], state[12];
 
                if (esnprintf(path, sizeof(path),
-                             "/sys/class/power_supply/%s/status",
-                             bat) < 0) {
+                             "/sys/class/power_supply/%s/status", bat) < 0) {
                        return NULL;
                }
                if (pscanf(path, "%12s", state) != 1) {
@@ -82,36 +75,42 @@
        const char *
        battery_remaining(const char *bat)
        {
-               int charge_now, current_now, m, h;
-               float timeleft;
+               uintmax_t charge_now, current_now, m, h;
+               double timeleft;
                char path[PATH_MAX], state[12];
 
                if (esnprintf(path, sizeof(path),
-                             "/sys/class/power_supply/%s/status",
-                             bat) < 0) {
+                             "/sys/class/power_supply/%s/status", bat) < 0) {
                        return NULL;
                }
                if (pscanf(path, "%12s", state) != 1) {
                        return NULL;
                }
 
-               if (!pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof(path)) ||
-                   pscanf(path, "%d", &charge_now) < 0) {
+               if (!pick(bat, "/sys/class/power_supply/%s/charge_now",
+                         "/sys/class/power_supply/%s/energy_now", path,
+                         sizeof(path)) ||
+                   pscanf(path, "%ju", &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) {
+                           pscanf(path, "%ju", &current_now) < 0) {
+                               return NULL;
+                       }
+
+                       if (current_now == 0) {
                                return NULL;
                        }
 
-                       timeleft = (float)charge_now / (float)current_now;
+                       timeleft = (double)charge_now / (double)current_now;
                        h = timeleft;
-                       m = (timeleft - (float)h) * 60;
+                       m = (timeleft - (double)h) * 60;
 
-                       return bprintf("%dh %dm", h, m);
+                       return bprintf("%juh %jum", h, m);
                }
 
                return "";