pk
/
slstatus
mirror of https://github.com/pikami/slstatus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

battery: Remove unnecessary defines for paths

This commit is contained in:
Aaron Marcher 2018-07-06 23:55:18 +02:00
parent 16e15217c6
commit 609ef3aa1f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/battery.c
View File

@ -8,11 +8,6 @@
#include <limits.h> #include <limits.h>
#include <unistd.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 * static const char *
pick(const char *bat, const char *f1, const char *f2, char *path, pick(const char *bat, const char *f1, const char *f2, char *path,
size_t length) size_t length)
@ -94,13 +89,16 @@
return NULL; return NULL;
} }
if (!pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof(path)) || 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, "%d", &charge_now) < 0) {
return NULL; return NULL;
} }
if (!strcmp(state, "Discharging")) { 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)) || sizeof(path)) ||
pscanf(path, "%d", &current_now) < 0) { pscanf(path, "%d", &current_now) < 0) {
return NULL; return NULL;