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