diff options
author | Max Kellermann <max@duempel.org> | 2008-09-07 13:39:19 +0200 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2008-09-09 00:55:39 -0700 |
commit | e29a971c9619a6e988dceb5335645f7ae10a527e (patch) | |
tree | 166298cfb6e489e79726be71459bd3293867e1b4 /src | |
parent | 9e53c28046bae4a02387aba5ddaddc74f7bcf246 (diff) | |
download | mpd-e29a971c9619a6e988dceb5335645f7ae10a527e.tar.gz mpd-e29a971c9619a6e988dceb5335645f7ae10a527e.tar.xz mpd-e29a971c9619a6e988dceb5335645f7ae10a527e.zip |
playlist: showPlaylist() and shufflePlaylist() cannot fail
Make them both return void.
Diffstat (limited to 'src')
-rw-r--r-- | src/command.c | 6 | ||||
-rw-r--r-- | src/playlist.c | 8 | ||||
-rw-r--r-- | src/playlist.h | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/command.c b/src/command.c index 77548664f..14932b7d2 100644 --- a/src/command.c +++ b/src/command.c @@ -435,13 +435,15 @@ static int handleDeleteId(int fd, mpd_unused int *permission, static int handlePlaylist(int fd, mpd_unused int *permission, mpd_unused int argc, mpd_unused char *argv[]) { - return showPlaylist(fd); + showPlaylist(fd); + return 0; } static int handleShuffle(int fd, mpd_unused int *permission, mpd_unused int argc, mpd_unused char *argv[]) { - return shufflePlaylist(fd); + shufflePlaylist(fd); + return 0; } static int handleClear(mpd_unused int fd, mpd_unused int *permission, diff --git a/src/playlist.c b/src/playlist.c index 6081f1fde..7d782c1a1 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -243,7 +243,7 @@ int clearStoredPlaylist(int fd, const char *utf8file) return removeAllFromStoredPlaylistByPath(fd, utf8file); } -int showPlaylist(int fd) +void showPlaylist(int fd) { int i; char path_max_tmp[MPD_PATH_MAX]; @@ -252,8 +252,6 @@ int showPlaylist(int fd) fdprintf(fd, "%i:%s\n", i, get_song_url(path_max_tmp, playlist.songs[i])); } - - return 0; } void savePlaylistState(FILE *fp) @@ -1256,7 +1254,7 @@ void previousSongInPlaylist(void) play_order_num(prev_order_num, 0); } -int shufflePlaylist(mpd_unused int fd) +void shufflePlaylist(mpd_unused int fd) { int i; int ri; @@ -1293,8 +1291,6 @@ int shufflePlaylist(mpd_unused int fd) if (playlist_state == PLAYLIST_STATE_PLAY) queueNextSongInPlaylist(); } - - return 0; } int deletePlaylist(int fd, const char *utf8file) diff --git a/src/playlist.h b/src/playlist.h index cae38becf..3afe33da0 100644 --- a/src/playlist.h +++ b/src/playlist.h @@ -46,7 +46,7 @@ int addToStoredPlaylist(int fd, const char *file, const char *utf8file); int addSongToPlaylist(int fd, Song * song, int *added_id); -int showPlaylist(int fd); +void showPlaylist(int fd); int deleteFromPlaylist(int fd, int song); @@ -74,7 +74,7 @@ void syncPlayerAndPlaylist(void); void previousSongInPlaylist(void); -int shufflePlaylist(int fd); +void shufflePlaylist(int fd); int savePlaylist(int fd, const char *utf8file); |