Xinqi Bao's Git

wifi: Fix order and add missing header
[slstatus.git] / components / volume.c
index b2ffb40..aa46446 100644 (file)
@@ -1,14 +1,14 @@
 /* See LICENSE file for copyright and license details. */
 #include <errno.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
 #if defined(__OpenBSD__)
-include <soundcard.h>
+       #include <soundcard.h>
 #else
-include <sys/soundcard.h>
+       #include <sys/soundcard.h>
 #endif
 #include <sys/ioctl.h>
-#include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "../util.h"
@@ -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;