print_volume: don’t return, complete the buffer first

Follow the changed done for Linux on f0cd726b

diff --git a/src/print_volume.c b/src/print_volume.c
index ef1c913212b5eda50f96d33fb704649555996b0b..bc469f33e7dbdf06bb9c7fa7e71179b9e804b4b9 100644 (file)
--- a/src/print_volume.c
+++ b/src/print_volume.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>

+#include <err.h>

 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_version.h>
 
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_version.h>
 


@@ -139,16 +140,22 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
     else
         mixerpath = defaultmixer;
 
     else
         mixerpath = defaultmixer;
 

-    if ((mixfd = open(mixerpath, O_RDWR)) < 0)
-        return;
+    if ((mixfd = open(mixerpath, O_RDWR)) < 0) {
+        warn("OSS: Cannot open mixer");
+        goto out;
+    }

 
     if (mixer_idx > 0)
         free(mixerpath);
 
 
     if (mixer_idx > 0)
         free(mixerpath);
 

-    if (ioctl(mixfd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1)
-        return;
-    if (ioctl(mixfd, MIXER_READ(0), &vol) == -1)
-        return;
+    if (ioctl(mixfd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) {
+        warn("OSS: Cannot read mixer information");
+        goto out;
+    }
+    if (ioctl(mixfd, MIXER_READ(0), &vol) == -1) {
+        warn("OSS: Cannot read mixer information");
+        goto out;
+    }

 
     if (((vol & 0x7f) == 0) && (((vol >> 8) & 0x7f) == 0)) {
         START_COLOR("color_degraded");
 
     if (((vol & 0x7f) == 0) && (((vol >> 8) & 0x7f) == 0)) {
         START_COLOR("color_degraded");