From eaf5d6bf801baa6169d388b910a75f8108499239 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 25 Mar 2015 08:13:47 +0100 Subject: print_volume: don’t return, complete the buffer first MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow the changed done for Linux on f0cd726b --- src/print_volume.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'src/print_volume.c') diff --git a/src/print_volume.c b/src/print_volume.c index ef1c913..bc469f3 100644 --- a/src/print_volume.c +++ b/src/print_volume.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -139,16 +140,22 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * 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 (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"); -- cgit v1.2.3