Fix ram_free for Linux

[slstatus.git] / components / volume.c

diff --git a/components/volume.c b/components/volume.c
index 41a112d..8674211 100644 (file)
--- a/components/volume.c
+++ b/components/volume.c
@@ -1,14 +1,14 @@
 /* See LICENSE file for copyright and license details. */
 #include <errno.h>
 #include <fcntl.h>
 /* See LICENSE file for copyright and license details. */
 #include <errno.h>
 #include <fcntl.h>

+#include <stdio.h>
+#include <string.h>

 #if defined(__OpenBSD__)
 #if defined(__OpenBSD__)

-# include <soundcard.h>
+       #include <soundcard.h>

 #else
 #else

-# include <sys/soundcard.h>
+       #include <sys/soundcard.h>

 #endif
 #include <sys/ioctl.h>
 #endif
 #include <sys/ioctl.h>

-#include <stdio.h>
-#include <string.h>

 #include <unistd.h>
 
 #include "../util.h"
 #include <unistd.h>
 
 #include "../util.h"


@@ -16,25 +16,24 @@
 const char *
 vol_perc(const char *card)
 {
 const char *
 vol_perc(const char *card)
 {

-       unsigned int i;
+       size_t i;

        int v, afd, devmask;
        char *vnames[] = SOUND_DEVICE_NAMES;
 
        int v, afd, devmask;
        char *vnames[] = SOUND_DEVICE_NAMES;
 

-       afd = open(card, O_RDONLY | O_NONBLOCK);
-       if (afd == -1) {
-               fprintf(stderr, "open '%s': %s\n", card, strerror(errno));
+       if ((afd = open(card, O_RDONLY | O_NONBLOCK)) < 0) {
+               warn("open '%s':", card);

                return NULL;
        }
 
                return NULL;
        }
 

-       if (ioctl(afd, (int)SOUND_MIXER_READ_DEVMASK, &devmask) == -1) {
-               fprintf(stderr, "ioctl 'SOUND_MIXER_READ_DEVMASK': %s\n", strerror(errno));
+       if (ioctl(afd, (int)SOUND_MIXER_READ_DEVMASK, &devmask) < 0) {
+               warn("ioctl 'SOUND_MIXER_READ_DEVMASK':");

                close(afd);
                return NULL;
        }
        for (i = 0; i < LEN(vnames); i++) {
                if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {
                close(afd);
                return NULL;
        }
        for (i = 0; i < LEN(vnames); i++) {
                if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {

-                       if (ioctl(afd, MIXER_READ(i), &v) == -1) {
-                               fprintf(stderr, "ioctl 'MIXER_READ(%d)': %s\n", i, strerror(errno));
+                       if (ioctl(afd, MIXER_READ(i), &v) < 0) {
+                               warn("ioctl 'MIXER_READ(%ld)':", i);

                                close(afd);
                                return NULL;
                        }
                                close(afd);
                                return NULL;
                        }