Unify type of `i` in for loops

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index e997e4c..0871953 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -16,8 +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, "%i", &perc) == 1) ? bprintf("%d", perc) : NULL;

        }
 
        const char *
        }
 
        const char *


@@ -29,7 +28,6 @@
                } map[] = {
                        { "Charging",    "+" },
                        { "Discharging", "-" },
                } map[] = {
                        { "Charging",    "+" },
                        { "Discharging", "-" },

-                       { "Full",        "=" },

                };
                size_t i;
                char path[PATH_MAX], state[12];
                };
                size_t i;
                char path[PATH_MAX], state[12];


@@ -79,8 +77,7 @@
        const char *
        battery_state(const char *bat)
        {
        const char *
        battery_state(const char *bat)
        {

-               int fd;
-               size_t i;
+               int fd, i;

                struct apm_power_info apm_info;
                struct {
                        unsigned int state;
                struct apm_power_info apm_info;
                struct {
                        unsigned int state;