X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/aa8654795da19a8d517faf1b84cd4dc4ac75f6e7..c93971748cb4771aec25aee6e8ff5b7bbb1aacf3:/components/battery.c?ds=sidebyside

diff --git a/components/battery.c b/components/battery.c
index 8bfe42a..79d16c2 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -7,13 +6,9 @@
 
 #if defined(__linux__)
 	#include <limits.h>
+	#include <stdint.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 *
 	pick(const char *bat, const char *f1, const char *f2, char *path,
 	     size_t length)
@@ -82,7 +77,7 @@
 	const char *
 	battery_remaining(const char *bat)
 	{
-		int charge_now, current_now, m, h;
+		uintmax_t charge_now, current_now, m, h;
 		double timeleft;
 		char path[PATH_MAX], state[12];
 
@@ -95,15 +90,18 @@
 			return NULL;
 		}
 
-		if (!pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof(path)) ||
-		    pscanf(path, "%d", &charge_now) < 0) {
+		if (!pick(bat, "/sys/class/power_supply/%s/charge_now",
+		          "/sys/class/power_supply/%s/energy_now",
+		          path, sizeof(path)) ||
+		    pscanf(path, "%ju", &charge_now) < 0) {
 			return NULL;
 		}
 
 		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)) ||
-			    pscanf(path, "%d", &current_now) < 0) {
+			    pscanf(path, "%ju", &current_now) < 0) {
 				return NULL;
 			}
 
@@ -115,7 +113,7 @@
 			h = timeleft;
 			m = (timeleft - (double)h) * 60;
 
-			return bprintf("%dh %dm", h, m);
+			return bprintf("%juh %jum", h, m);
 		}
 
 		return "";