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

update: fixed shadow warning on "basename"

Browse Source 
Renamed the local variable "basename", which shadows the POSIX
function basename().
This commit is contained in:
Max Kellermann 2008-11-22 14:57:08 +01:00
parent d9b3efa6a1
commit 116662e5a9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/update.c
View File

@ -412,7 +412,7 @@ static struct directory *
directory_make_child_checked(struct directory *parent, const char *path) directory_make_child_checked(struct directory *parent, const char *path)
{ {
struct directory *directory; struct directory *directory;
char *basename; char *base;
struct stat st; struct stat st;
struct song *conflicting; struct song *conflicting;
@ -420,21 +420,21 @@ directory_make_child_checked(struct directory *parent, const char *path)
if (directory != NULL) if (directory != NULL)
return directory; 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)) { inodeFoundInParent(parent, st.st_ino, st.st_dev)) {
g_free(basename); g_free(base);
return NULL; return NULL;
} }
/* if we're adding directory paths, make sure to delete filenames /* if we're adding directory paths, make sure to delete filenames
with potentially the same name */ with potentially the same name */
conflicting = songvec_find(&parent->songs, basename); conflicting = songvec_find(&parent->songs, base);
if (conflicting) if (conflicting)
delete_song(parent, conflicting); delete_song(parent, conflicting);
g_free(basename); g_free(base);
directory = directory_new_child(parent, path); directory = directory_new_child(parent, path);
directory_set_stat(directory, &st); directory_set_stat(directory, &st);