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

song: replace printSong* with song_print_*

Browse Source 
This make argument order more consistent for iterators.
Additionally, these now return ssize_t results for error
checking.
This commit is contained in:
Eric Wong 2008-10-07 22:06:59 +02:00 committed by Max Kellermann
parent 0d34815f6c
commit e19f6905d9
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dbUtils.c
View File

@ -68,7 +68,7 @@ static int printDirectoryInDirectory(Directory * directory, void *data)
static int printSongInDirectory(Song * song, mpd_unused void *data)
{
struct client *client = data;
printSongUrl(client, song);
song_print_url(client, song);
return 0;
}
@ -83,7 +83,7 @@ static int searchInDirectory(Song * song, void *_data)
LocateTagItemArray *array = &data->array;
if (strstrSearchTags(song, array->numItems, array->items))
printSongInfo(data->client, song);
song_print_info(data->client, song);
return 0;
}
@ -124,7 +124,7 @@ static int findInDirectory(Song * song, void *_data)
LocateTagItemArray *array = &data->array;
if (tagItemsFoundAndMatches(song, array->numItems, array->items))
printSongInfo(data->client, song);
song_print_info(data->client, song);
return 0;
}
@ -221,8 +221,8 @@ int addAllInToStoredPlaylist(const char *name, const char *utf8file)
static int directoryPrintSongInfo(Song * song, void *data)
{
struct client *client = data;
return printSongInfo(client, song);
song_print_info(client, song);
return 0;
}
static int sumSongTime(Song * song, void *data)
@ -285,7 +285,7 @@ static void visitTag(struct client *client, struct strset *set,
struct tag *tag = song->tag;
if (tagType == LOCATE_TAG_FILE_TYPE) {
printSongUrl(client, song);
song_print_url(client, song);
return;
}

4
src/playlist.c
View File

@ -365,7 +365,7 @@ void readPlaylistState(FILE *fp)
static void printPlaylistSongInfo(struct client *client, int song)
{
printSongInfo(client, playlist.songs[song]);
song_print_info(client, playlist.songs[song]);
client_printf(client, "Pos: %i\nId: %i\n", song, playlist.positionToId[song]);
}
@ -1360,7 +1360,7 @@ int PlaylistInfo(struct client *client, const char *utf8file, int detail)
if (detail) {
Song *song = getSongFromDB(temp);
if (song) {
printSongInfo(client, song);
song_print_info(client, song);
wrote = 1;
}
}

8
src/song_print.c
View File

@ -22,7 +22,7 @@
#include "tag_print.h"
#include "client.h"
void printSongUrl(struct client *client, Song * song)
void song_print_url(struct client *client, Song * song)
{
if (song->parentDir && song->parentDir->path) {
client_printf(client, "%s%s/%s\n", SONG_FILE,
@ -32,9 +32,9 @@ void printSongUrl(struct client *client, Song * song)
}
}
int printSongInfo(struct client *client, Song * song)
int song_print_info(struct client *client, Song * song)
{
printSongUrl(client, song);
song_print_url(client, song);
if (song->tag)
tag_print(client, song->tag);
@ -48,7 +48,7 @@ int songvec_print(struct client *client, const struct songvec *sv)
Song **sp = sv->base;
for (i = sv->nr; --i >= 0;)
if (printSongInfo(client, *sp++) < 0)
if (song_print_info(client, *sp++) < 0)
return -1;
return 0;

4
src/song_print.h
View File

@ -23,10 +23,10 @@
struct songvec;
int printSongInfo(struct client *client, Song * song);
int song_print_info(struct client *client, Song * song);
int songvec_print(struct client *client, const struct songvec *sv);
void printSongUrl(struct client *client, Song * song);
void song_print_url(struct client *client, Song * song);
#endif