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

Simplify format specifiers for uintmax_t

Browse Source
This commit is contained in:
Aaron Marcher
2018-07-07 11:08:26 +02:00
parent c2492c3f99
commit acfa1f50c2
7 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/battery.c
View File

@ -5,8 +5,8 @@
#include "../util.h"
#if defined(__linux__)
#include <inttypes.h>
#include <limits.h>
#include <stdint.h>
#include <unistd.h>
static const char *
@ -93,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, "%" PRIuMAX, &charge_now) < 0) {
pscanf(path, "%ju", &charge_now) < 0) {
return NULL;
}
@ -101,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, "%" PRIuMAX, &current_now) < 0) {
pscanf(path, "%ju", &current_now) < 0) {
return NULL;
}
@ -113,7 +113,7 @@
h = timeleft;
m = (timeleft - (double)h) * 60;
return bprintf("%" PRIuMAX "h %" PRIuMAX "m", h, m);
return bprintf("%juh %jum", h, m);
}
return "";