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

battery: Consistent naming for capacity percentage 

https://www.kernel.org/doc/html/latest/power/power_supply_class.html

Co-authored-by: drkhsh <me@drkhsh.at>
Signed-off-by: drkhsh <me@drkhsh.at>
This commit is contained in:
planet36 2021-04-06 12:48:18 -04:00 committed by drkhsh
parent d77f216fae
commit 87c3dd2c36
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/battery.c
View File

@ -6,6 +6,9 @@
#include "../util.h" #include "../util.h"
#if defined(__linux__) #if defined(__linux__)
/*
* https://www.kernel.org/doc/html/latest/power/power_supply_class.html
*/
#include <limits.h> #include <limits.h>
#include <stdint.h> #include <stdint.h>
#include <unistd.h> #include <unistd.h>
@ -35,15 +38,15 @@
const char * const char *
battery_perc(const char *bat) battery_perc(const char *bat)
{ {
int perc; int cap_perc;
char path[PATH_MAX]; char path[PATH_MAX];
if (esnprintf(path, sizeof(path), POWER_SUPPLY_CAPACITY, bat) < 0) if (esnprintf(path, sizeof(path), POWER_SUPPLY_CAPACITY, bat) < 0)
return NULL; return NULL;
if (pscanf(path, "%d", &perc) != 1) if (pscanf(path, "%d", &cap_perc) != 1)
return NULL; return NULL;
return bprintf("%d", perc); return bprintf("%d", cap_perc);
} }
const char * const char *
@ -197,14 +200,14 @@
const char * const char *
battery_perc(const char *unused) battery_perc(const char *unused)
{ {
int cap; int cap_perc;
size_t len; size_t len;
len = sizeof(cap); len = sizeof(cap_perc);
if (sysctlbyname(BATTERY_LIFE, &cap, &len, NULL, 0) < 0 || !len) if (sysctlbyname(BATTERY_LIFE, &cap_perc, &len, NULL, 0) < 0 || !len)
return NULL; return NULL;
return bprintf("%d", cap); return bprintf("%d", cap_perc);
} }
const char * const char *