summaryrefslogtreecommitdiff
path: root/src/volume.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-01-26 12:46:21 +0000
committerEric Wong <normalperson@yhbt.net>2008-01-26 12:46:21 +0000
commit07adb14e3c4daa8b1e6ebc69e54128b38b014d30 (patch)
tree7d22b4b2eb31a9bf46cf648731fe1370005ab1c9 /src/volume.c
parent28008e697720bb2b11989bb887eb468b91409b1a (diff)
fixed -Wshadow warnings
Signed-off-by: Eric Wong <normalperson@yhbt.net> git-svn-id: https://svn.musicpd.org/mpd/trunk@7143 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/volume.c')
-rw-r--r--src/volume.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/volume.c b/src/volume.c
index 6f11377e5..736838139 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -95,7 +95,7 @@ static int prepOssMixer(char *device)
if (param) {
char *labels[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
- char *dup;
+ char *duplicated;
int i, j;
int devmask = 0;
@@ -106,16 +106,16 @@ static int prepOssMixer(char *device)
}
for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
- dup = xstrdup(labels[i]);
+ duplicated = xstrdup(labels[i]);
/* eliminate spaces at the end */
- j = strlen(dup) - 1;
- while (j >= 0 && dup[j] == ' ')
- dup[j--] = '\0';
- if (strcasecmp(dup, param->value) == 0) {
- free(dup);
+ j = strlen(duplicated) - 1;
+ while (j >= 0 && duplicated[j] == ' ')
+ duplicated[j--] = '\0';
+ if (strcasecmp(duplicated, param->value) == 0) {
+ free(duplicated);
break;
}
- free(dup);
+ free(duplicated);
}
if (i >= SOUND_MIXER_NRDEVICES) {