diff options
author | Laslo Hunhold <dev@frign.de> | 2018-05-18 10:59:05 +0200 |
---|---|---|
committer | Aaron Marcher <me@drkhsh.at> | 2018-05-18 11:13:05 +0200 |
commit | 80fc20d1d69b14f36ad9bb64d8af38481cbf1ff5 (patch) | |
tree | ecd06a739fc89f6041aa2d84073f5bc1e0a0bad9 /components/volume.c | |
parent | a4fe8c97414f07dd8b891e0d325dd2733195151d (diff) |
Add warn() and die()
Given slstatus is a tool that runs in the background, most likely run
from .xinitrc, it's important to prepend the name of the tool to error
messages so it becomes clear where the error is coming from.
To make this much more consistent, this commit adds warn() and die()
utility functions consistent with other suckless projects and adapts all
calls to fprintf(stderr, *) to the warn() and die() functions, greatly
increasing the readability of the code.
Diffstat (limited to 'components/volume.c')
-rw-r--r-- | components/volume.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/components/volume.c b/components/volume.c index aa46446..8674211 100644 --- a/components/volume.c +++ b/components/volume.c @@ -21,21 +21,19 @@ vol_perc(const char *card) char *vnames[] = SOUND_DEVICE_NAMES; if ((afd = open(card, O_RDONLY | O_NONBLOCK)) < 0) { - fprintf(stderr, "open '%s': %s\n", card, strerror(errno)); + warn("open '%s':", card); return NULL; } if (ioctl(afd, (int)SOUND_MIXER_READ_DEVMASK, &devmask) < 0) { - fprintf(stderr, "ioctl 'SOUND_MIXER_READ_DEVMASK': %s\n", - strerror(errno)); + 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])) { if (ioctl(afd, MIXER_READ(i), &v) < 0) { - fprintf(stderr, "ioctl 'MIXER_READ(%ld)': %s\n", i, - strerror(errno)); + warn("ioctl 'MIXER_READ(%ld)':", i); close(afd); return NULL; } |