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

playlist: PlaylistInfo() does not call commandError()

Browse Source 
Continuing the effort of removing protocol specific calls from the
core libraries: let the command.c code call commandError() based on
PlaylistInfo's return value.
This commit is contained in:
Max Kellermann 2008-09-07 13:44:20 +02:00
parent a8b225f947
commit d8ef33b710
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/command.c
View File

@ -540,13 +540,25 @@ static int handleLoad(int fd, mpd_unused int *permission,
static int handleListPlaylist(int fd, mpd_unused int *permission, static int handleListPlaylist(int fd, mpd_unused int *permission,
mpd_unused int argc, char *argv[]) mpd_unused int argc, char *argv[])
{ {
return PlaylistInfo(fd, argv[1], 0); int ret;
ret = PlaylistInfo(fd, argv[1], 0);
if (ret == -1)
commandError(fd, ACK_ERROR_NO_EXIST, "No such playlist");
return ret;
} }
static int handleListPlaylistInfo(int fd, mpd_unused int *permission, static int handleListPlaylistInfo(int fd, mpd_unused int *permission,
mpd_unused int argc, char *argv[]) mpd_unused int argc, char *argv[])
{ {
return PlaylistInfo(fd, argv[1], 1); int ret;
ret = PlaylistInfo(fd, argv[1], 1);
if (ret == -1)
commandError(fd, ACK_ERROR_NO_EXIST, "No such playlist");
return ret;
} }
static int handleLsInfo(int fd, mpd_unused int *permission, static int handleLsInfo(int fd, mpd_unused int *permission,

5
src/playlist.c
View File

@ -1342,11 +1342,8 @@ int PlaylistInfo(int fd, const char *utf8file, int detail)
ListNode *node; ListNode *node;
List *list; List *list;
if (!(list = loadStoredPlaylist(utf8file))) { if (!(list = loadStoredPlaylist(utf8file)))
commandError(fd, ACK_ERROR_NO_EXIST, "could not open playlist "
"\"%s\": %s", utf8file, strerror(errno));
return -1; return -1;
}
node = list->firstNode; node = list->firstNode;
while (node != NULL) { while (node != NULL) {