battery: 64 bit ints on Linux - slstatus - status monitor | |
git clone git://git.suckless.org/slstatus | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit d76b1a21fc014395cf9f7bd4e14180a3a0945e9c | |
parent b792b7ab69c24bedf8147c734a849ae0c54da1dc | |
Author: Aaron Marcher <[email protected]> | |
Date: Sat, 7 Jul 2018 10:31:57 +0200 | |
battery: 64 bit ints on Linux | |
Diffstat: | |
M components/battery.c | 9 +++++---- | |
1 file changed, 5 insertions(+), 4 deletions(-) | |
--- | |
diff --git a/components/battery.c b/components/battery.c | |
@@ -5,6 +5,7 @@ | |
#include "../util.h" | |
#if defined(__linux__) | |
+ #include <inttypes.h> | |
#include <limits.h> | |
#include <unistd.h> | |
@@ -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 ""; |