Implement fmt_scaled for swap_* functions

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index c7c402a..3965e8f 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -16,7 +16,7 @@
 
                snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
                         bat, "/capacity");
 
                snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
                         bat, "/capacity");

-               return (pscanf(path, "%i", &perc) == 1) ? bprintf("%d", perc) : NULL;
+               return (pscanf(path, "%d", &perc) == 1) ? bprintf("%d", perc) : NULL;

        }
 
        const char *
        }
 
        const char *


@@ -62,12 +62,12 @@
                if (!strcmp(state, "Discharging")) {
                        snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
                                         bat, "/charge_now");
                if (!strcmp(state, "Discharging")) {
                        snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
                                         bat, "/charge_now");

-                       if (pscanf(path, "%i", &charge_now) != 1) {
+                       if (pscanf(path, "%d", &charge_now) != 1) {

                                return NULL;
                        }
                        snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
                                         bat, "/current_now");
                                return NULL;
                        }
                        snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
                                         bat, "/current_now");

-                       if (pscanf(path, "%i", &current_now) != 1) {
+                       if (pscanf(path, "%d", &current_now) != 1) {

                                return NULL;
                        }
 
                                return NULL;
                        }