From d76b1a21fc014395cf9f7bd4e14180a3a0945e9c Mon Sep 17 00:00:00 2001 From: Aaron Marcher Date: Sat, 7 Jul 2018 10:31:57 +0200 Subject: battery: 64 bit ints on Linux --- components/battery.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'components/battery.c') diff --git a/components/battery.c b/components/battery.c index 82e0baf..31c7d48 100644 --- a/components/battery.c +++ b/components/battery.c @@ -5,6 +5,7 @@ #include "../util.h" #if defined(__linux__) + #include #include #include @@ -76,7 +77,7 @@ const char * battery_remaining(const char *bat) { - int charge_now, current_now, m, h; + uint64_t charge_now, current_now, m, h; double timeleft; char path[PATH_MAX], state[12]; @@ -92,7 +93,7 @@ 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) { + pscanf(path, "%" PRIu64, &charge_now) < 0) { return NULL; } @@ -100,7 +101,7 @@ if (!pick(bat, "/sys/class/power_supply/%s/current_now", "/sys/class/power_supply/%s/power_now", path, sizeof(path)) || - pscanf(path, "%d", ¤t_now) < 0) { + pscanf(path, "%" PRIu64, ¤t_now) < 0) { return NULL; } @@ -112,7 +113,7 @@ h = timeleft; m = (timeleft - (double)h) * 60; - return bprintf("%dh %dm", h, m); + return bprintf("%" PRIu64 "h %" PRIu64 "m", h, m); } return ""; -- cgit v1.2.3