diff options
author | Max Kellermann <max@duempel.org> | 2008-11-22 14:57:08 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2008-11-22 14:57:08 +0100 |
commit | 116662e5a91a8cd4cd9f6d61fba63ceef6cc070b (patch) | |
tree | 6cafe764fe6ba7c8a257b12484606b17099deb4e | |
parent | d9b3efa6a140539e70d8c316899baa0cc95315f4 (diff) | |
download | mpd-116662e5a91a8cd4cd9f6d61fba63ceef6cc070b.tar.gz mpd-116662e5a91a8cd4cd9f6d61fba63ceef6cc070b.tar.xz mpd-116662e5a91a8cd4cd9f6d61fba63ceef6cc070b.zip |
update: fixed shadow warning on "basename"
Renamed the local variable "basename", which shadows the POSIX
function basename().
Diffstat (limited to '')
-rw-r--r-- | src/update.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/update.c b/src/update.c index dac4f08f4..c84f91616 100644 --- a/src/update.c +++ b/src/update.c @@ -412,7 +412,7 @@ static struct directory * directory_make_child_checked(struct directory *parent, const char *path) { struct directory *directory; - char *basename; + char *base; struct stat st; struct song *conflicting; @@ -420,21 +420,21 @@ directory_make_child_checked(struct directory *parent, const char *path) if (directory != NULL) return directory; - basename = g_path_get_basename(path); + base = g_path_get_basename(path); - if (stat_directory_child(parent, basename, &st) < 0 || + if (stat_directory_child(parent, base, &st) < 0 || inodeFoundInParent(parent, st.st_ino, st.st_dev)) { - g_free(basename); + g_free(base); return NULL; } /* if we're adding directory paths, make sure to delete filenames with potentially the same name */ - conflicting = songvec_find(&parent->songs, basename); + conflicting = songvec_find(&parent->songs, base); if (conflicting) delete_song(parent, conflicting); - g_free(basename); + g_free(base); directory = directory_new_child(parent, path); directory_set_stat(directory, &st); |