fallingsky04
/
slstatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

battery: 64 bit ints on Linux

This commit is contained in:
Aaron Marcher 2018-07-07 10:31:57 +02:00
parent b792b7ab69
commit d76b1a21fc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/battery.c
View File

@ -5,6 +5,7 @@
#include "../util.h" #include "../util.h"
#if defined(__linux__) #if defined(__linux__)
#include <inttypes.h>
#include <limits.h> #include <limits.h>
#include <unistd.h> #include <unistd.h>
@ -76,7 +77,7 @@
const char * const char *
battery_remaining(const char *bat) battery_remaining(const char *bat)
{ {
int charge_now, current_now, m, h; uint64_t charge_now, current_now, m, h;
double timeleft; double timeleft;
char path[PATH_MAX], state[12]; char path[PATH_MAX], state[12];
@ -92,7 +93,7 @@
if (!pick(bat, "/sys/class/power_supply/%s/charge_now", if (!pick(bat, "/sys/class/power_supply/%s/charge_now",
"/sys/class/power_supply/%s/energy_now", "/sys/class/power_supply/%s/energy_now",
path, sizeof(path)) || path, sizeof(path)) ||
pscanf(path, "%d", &charge_now) < 0) { pscanf(path, "%" PRIu64, &charge_now) < 0) {
return NULL; return NULL;
} }
@ -100,7 +101,7 @@
if (!pick(bat, "/sys/class/power_supply/%s/current_now", if (!pick(bat, "/sys/class/power_supply/%s/current_now",
"/sys/class/power_supply/%s/power_now", path, "/sys/class/power_supply/%s/power_now", path,
sizeof(path)) || sizeof(path)) ||
pscanf(path, "%d", &current_now) < 0) { pscanf(path, "%" PRIu64, &current_now) < 0) {
return NULL; return NULL;
} }
@ -112,7 +113,7 @@
h = timeleft; h = timeleft;
m = (timeleft - (double)h) * 60; m = (timeleft - (double)h) * 60;
return bprintf("%dh %dm", h, m); return bprintf("%" PRIu64 "h %" PRIu64 "m", h, m);
} }
return ""; return "";