 |
battery: Consistent naming for capacity percentage - slstatus - status monitor |
 |
git clone git://git.suckless.org/slstatus |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 87c3dd2c36e6d1df577e87fd4d73970fe58a3007 |
|
parent d77f216faea5566ba8ebdbf1456c5e6806d2eeb5 |
|
Author: planet36 <[email protected]> |
|
Date: Tue, 6 Apr 2021 12:48:18 -0400 |
|
|
|
battery: Consistent naming for capacity percentage |
|
|
|
https://www.kernel.org/doc/html/latest/power/power_supply_class.html |
|
|
|
Co-authored-by: drkhsh <[email protected]> |
|
Signed-off-by: drkhsh <[email protected]> |
|
|
|
Diffstat: |
|
M components/battery.c | 17 ++++++++++------- |
|
|
|
1 file changed, 10 insertions(+), 7 deletions(-) |
|
--- |
|
diff --git a/components/battery.c b/components/battery.c |
|
@@ -6,6 +6,9 @@ |
|
#include "../util.h" |
|
|
|
#if defined(__linux__) |
|
+/* |
|
+ * https://www.kernel.org/doc/html/latest/power/power_supply_class.html |
|
+ */ |
|
#include <limits.h> |
|
#include <stdint.h> |
|
#include <unistd.h> |
|
@@ -35,15 +38,15 @@ |
|
const char * |
|
battery_perc(const char *bat) |
|
{ |
|
- int perc; |
|
+ int cap_perc; |
|
char path[PATH_MAX]; |
|
|
|
if (esnprintf(path, sizeof(path), POWER_SUPPLY_CAPACITY, bat) … |
|
return NULL; |
|
- if (pscanf(path, "%d", &perc) != 1) |
|
+ if (pscanf(path, "%d", &cap_perc) != 1) |
|
return NULL; |
|
|
|
- return bprintf("%d", perc); |
|
+ return bprintf("%d", cap_perc); |
|
} |
|
|
|
const char * |
|
@@ -197,14 +200,14 @@ |
|
const char * |
|
battery_perc(const char *unused) |
|
{ |
|
- int cap; |
|
+ int cap_perc; |
|
size_t len; |
|
|
|
- len = sizeof(cap); |
|
- if (sysctlbyname(BATTERY_LIFE, &cap, &len, NULL, 0) < 0 || !le… |
|
+ len = sizeof(cap_perc); |
|
+ if (sysctlbyname(BATTERY_LIFE, &cap_perc, &len, NULL, 0) < 0 |… |
|
return NULL; |
|
|
|
- return bprintf("%d", cap); |
|
+ return bprintf("%d", cap_perc); |
|
} |
|
|
|
const char * |
