playlist: PlaylistInfo() does not call commandError()

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.

playlist: PlaylistInfo() does not call commandError()
d8ef33b7 · Max Kellermann · a8b225f9 · d8ef33b7 · d8ef33b7
Commit d8ef33b7 authored Sep 07, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 6 deletions

command.c src/command.c +14 -2

playlist.c src/playlist.c +1 -4

No files found.
--- a/src/command.c
+++ b/src/command.c
@@ -540,13 +540,25 @@ static int handleLoad(int fd, mpd_unused int *permission,
 static int handleListPlaylist(int fd, mpd_unused int *permission,
 			      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,
 				  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,

--- a/src/playlist.c
+++ b/src/playlist.c
@@ -1342,11 +1342,8 @@ int PlaylistInfo(int fd, const char *utf8file, int detail)
 	ListNode *node;
 	List *list;

-	if (!(list = loadStoredPlaylist(utf8file))) {
-		commandError(fd, ACK_ERROR_NO_EXIST, "could not open playlist "
-		             "\"%s\": %s", utf8file, strerror(errno));
+	if (!(list = loadStoredPlaylist(utf8file)))
 		return -1;
-	}

 	node = list->firstNode;
 	while (node != NULL) {