pbentes/slstatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of err.h as it is not portable

Browse Source 
Replace warn() and warnx() with fprintf() and add <stdio.h> where
necessary.
This commit is contained in:
Aaron Marcher
2018-03-28 18:26:56 +02:00
parent aced832622
commit 96f3a8a54e
13 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/volume.c
View File

@ -1,6 +1,5 @@
/* See LICENSE file for copyright and license details. */
#if defined(__linux__)
#include <err.h>
#include <fcntl.h>
#include <sys/soundcard.h>
#include <sys/ioctl.h>
@ -19,19 +18,19 @@ vol_perc(const char *card)
afd = open(card, O_RDONLY | O_NONBLOCK);
if (afd == -1) {
warn("Cannot open %s", card);
fprintf(stderr, "Cannot open %s", card);
return NULL;
}
if (ioctl(afd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) {
warn("Cannot get volume for %s", card);
fprintf(stderr, "Cannot get volume for %s", card);
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) {
warn("vol_perc: ioctl");
fprintf(stderr, "vol_perc: ioctl");
close(afd);
return NULL;
}