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

database: eliminate "goto" usage

Browse Source 
http://xkcd.com/292/
This commit is contained in:
Max Kellermann 2009-01-25 18:47:23 +01:00
parent a45922cd66
commit c4bb227bdb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/database.c
View File

@ -96,7 +96,7 @@ db_get_directory(const char *name)
struct song * struct song *
db_get_song(const char *file) db_get_song(const char *file)
{ {
struct song *song = NULL; struct song *song;
struct directory *directory; struct directory *directory;
char *duplicated, *shortname, *dir; char *duplicated, *shortname, *dir;
@ -118,13 +118,14 @@ db_get_song(const char *file)
dir = duplicated; dir = duplicated;
} }
if (!(directory = db_get_directory(dir))) directory = db_get_directory(dir);
goto out; if (directory != NULL)
if (!(song = songvec_find(&directory->songs, shortname))) song = songvec_find(&directory->songs, shortname);
goto out; else
assert(song->parent == directory); song = NULL;
assert(song == NULL || song->parent == directory);
out:
g_free(duplicated); g_free(duplicated);
return song; return song;
} }