oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

volume: eliminate alloca() usage

Browse Source 
alloca() is not a portable function.  Don't use it.  Using
strncasecmp() is much more efficient anyway, because no memory needs
to be allocated and copied.
This commit is contained in:
Max Kellermann 2008-11-14 18:15:33 +01:00
parent 19131f1eda
commit 7720a1195a
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/volume.c
View File

@ -79,8 +79,6 @@ static int volume_alsaSet = -1;
#ifdef HAVE_OSS #ifdef HAVE_OSS
#include <alloca.h> /* only alloca user in mpd atm, may change ... */
static void closeOssMixer(void) static void closeOssMixer(void)
{ {
while (close(volume_ossFd) && errno == EINTR) ; while (close(volume_ossFd) && errno == EINTR) ;
@ -91,17 +89,12 @@ static int
oss_find_mixer(const char *name) oss_find_mixer(const char *name)
{ {
const char *labels[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS; const char *labels[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
size_t name_length = strlen(name);
for (unsigned i = 0; i < SOUND_MIXER_NRDEVICES; i++) { for (unsigned i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
ssize_t len = strlen(labels[i]); if (strncasecmp(name, labels[i], name_length) == 0 &&
char *duplicated = alloca(len + 1); (labels[i][name_length] == 0 ||
labels[i][name_length] == ' '))
/* eliminate spaces at the end */
memcpy(duplicated, labels[i], len + 1);
len -= 2;
while (len >= 0 && duplicated[len] == ' ')
duplicated[len--] = '\0';
if (strcasecmp(duplicated, name) == 0)
return i; return i;
} }