Unify type of `i` in for loops

int for normal indexes
size_t for usage with the LEN macro

diff --git a/components/battery.c b/components/battery.c
index a63b9d01a25524338ae10d1125ac685294a22bd7..0871953fa618ebbe0cfc4d549378d63c98eb5f1b 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -77,8 +77,7 @@
        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;

diff --git a/components/volume.c b/components/volume.c
index ff25769b39cc07058dfa3eeb360940070c2bba18..aa46446d2961ddd3421e5461ee3845facd775abe 100644 (file)
--- a/components/volume.c
+++ b/components/volume.c
@@ -16,7 +16,7 @@
 const char *
 vol_perc(const char *card)
 {
-       unsigned int i;
+       size_t i;
        int v, afd, devmask;
        char *vnames[] = SOUND_DEVICE_NAMES;
 
@@ -34,7 +34,7 @@ vol_perc(const char *card)
        for (i = 0; i < LEN(vnames); i++) {
                if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {
                        if (ioctl(afd, MIXER_READ(i), &v) < 0) {
-                               fprintf(stderr, "ioctl 'MIXER_READ(%d)': %s\n", i,
+                               fprintf(stderr, "ioctl 'MIXER_READ(%ld)': %s\n", i,
                                        strerror(errno));
                                close(afd);
                                return NULL;