From a5f8bb82300d08568180482c93e8b9a067cc715d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 5 Oct 2008 20:54:11 -0700 Subject: song: replace printSong* with song_print_* This make argument order more consistent for iterators. Additionally, these now return ssize_t results for error checking. --- src/dbUtils.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/dbUtils.c') diff --git a/src/dbUtils.c b/src/dbUtils.c index 4cb3edcca..ff5f1883e 100644 --- a/src/dbUtils.c +++ b/src/dbUtils.c @@ -64,10 +64,9 @@ static int printDirectoryInDirectory(Directory * directory, void *data) return 0; } -static int printSongInDirectory(Song * song, mpd_unused void *data) +static int printSongInDirectory(Song * song, void *data) { - int fd = (int)(size_t)data; - printSongUrl(fd, song); + song_print_url(song, (int)(size_t)data); return 0; } @@ -83,7 +82,7 @@ static int searchInDirectory(Song * song, void *_data) LocateTagItemArray *array = &data->array; if (strstrSearchTags(song, array->numItems, array->items)) - printSongInfo(fd, song); + song_print_info(song, fd); return 0; } @@ -125,7 +124,7 @@ static int findInDirectory(Song * song, void *_data) LocateTagItemArray *array = &data->array; if (tagItemsFoundAndMatches(song, array->numItems, array->items)) - printSongInfo(fd, song); + song_print_info(song, fd); return 0; } @@ -220,9 +219,9 @@ int addAllInToStoredPlaylist(const char *name, const char *utf8file) static int directoryPrintSongInfo(Song * song, void *data) { - int fd = (int)(size_t)data; + song_print_info(song, (int)(size_t)data); - return printSongInfo(fd, song); + return 0; } static int sumSongTime(Song * song, void *data) @@ -285,7 +284,7 @@ static void visitTag(int fd, struct strset *set, struct mpd_tag *tag = song->tag; if (tagType == LOCATE_TAG_FILE_TYPE) { - printSongUrl(fd, song); + song_print_url(song, fd); return; } -- cgit v1.2.3 From d271b5f13090595b67de6f2161dc309bb43e6fbe Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 7 Oct 2008 02:01:21 -0700 Subject: dbUtils/directory: traverseAllIn forEachSong returns -1 on error Being consistent with most UNIX functions... --- src/dbUtils.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/dbUtils.c') diff --git a/src/dbUtils.c b/src/dbUtils.c index ff5f1883e..a9d83eb41 100644 --- a/src/dbUtils.c +++ b/src/dbUtils.c @@ -82,7 +82,8 @@ static int searchInDirectory(Song * song, void *_data) LocateTagItemArray *array = &data->array; if (strstrSearchTags(song, array->numItems, array->items)) - song_print_info(song, fd); + if (song_print_info(song, fd) < 0) + return -1; return 0; } @@ -124,7 +125,8 @@ static int findInDirectory(Song * song, void *_data) LocateTagItemArray *array = &data->array; if (tagItemsFoundAndMatches(song, array->numItems, array->items)) - song_print_info(song, fd); + if (song_print_info(song, fd) < 0) + return -1; return 0; } @@ -217,13 +219,6 @@ int addAllInToStoredPlaylist(const char *name, const char *utf8file) &data); } -static int directoryPrintSongInfo(Song * song, void *data) -{ - song_print_info(song, (int)(size_t)data); - - return 0; -} - static int sumSongTime(Song * song, void *data) { unsigned long *sum_time = (unsigned long *)data; @@ -236,7 +231,7 @@ static int sumSongTime(Song * song, void *data) int printInfoForAllIn(int fd, const char *name) { - return traverseAllIn(name, directoryPrintSongInfo, + return traverseAllIn(name, song_print_info_x, printDirectoryInDirectory, (void*)(size_t)fd); } -- cgit v1.2.3 From 99841dca7bdc7e85df88800df86e22bb70ed683d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 7 Oct 2008 02:08:29 -0700 Subject: dbUtils: more cleanups Remove unnecessary wrapper function now that we have song_print_url_x and also return the results directly since we'll know the song_print_* functions will all return -1 on error. --- src/dbUtils.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/dbUtils.c') diff --git a/src/dbUtils.c b/src/dbUtils.c index a9d83eb41..adcb7e0da 100644 --- a/src/dbUtils.c +++ b/src/dbUtils.c @@ -64,12 +64,6 @@ static int printDirectoryInDirectory(Directory * directory, void *data) return 0; } -static int printSongInDirectory(Song * song, void *data) -{ - song_print_url(song, (int)(size_t)data); - return 0; -} - struct search_data { int fd; LocateTagItemArray array; @@ -82,8 +76,7 @@ static int searchInDirectory(Song * song, void *_data) LocateTagItemArray *array = &data->array; if (strstrSearchTags(song, array->numItems, array->items)) - if (song_print_info(song, fd) < 0) - return -1; + return (int)song_print_info(song, fd); return 0; } @@ -125,8 +118,7 @@ static int findInDirectory(Song * song, void *_data) LocateTagItemArray *array = &data->array; if (tagItemsFoundAndMatches(song, array->numItems, array->items)) - if (song_print_info(song, fd) < 0) - return -1; + return (int)song_print_info(song, fd); return 0; } @@ -182,7 +174,7 @@ int searchStatsForSongsIn(int fd, const char *name, int numItems, int printAllIn(int fd, const char *name) { - return traverseAllIn(name, printSongInDirectory, + return traverseAllIn(name, song_print_url_x, printDirectoryInDirectory, (void*)(size_t)fd); } -- cgit v1.2.3