Skip to content

M
mpd
Commit 17b6491b authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

directory: printDirectoryInfo() does not call commandError()

Move another ocurrence of error handling over to command.c.
parent f320c9fa
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/command.c
View file @ 17b6491b
...@@ -575,8 +575,10 @@ static int handleLsInfo(int fd, mpd_unused int *permission, ...@@ -575,8 +575,10 @@ static int handleLsInfo(int fd, mpd_unused int *permission,
if (argc == 2) if (argc == 2)
path = argv[1]; path = argv[1];
if (printDirectoryInfo(fd, path) < 0) if (printDirectoryInfo(fd, path) < 0) {
commandError(fd, ACK_ERROR_NO_EXIST, "directory not found");
return -1; return -1;
}
if (isRootDirectory(path)) if (isRootDirectory(path))
return lsPlaylists(fd, path); return lsPlaylists(fd, path);
......
src/directory.c
View file @ 17b6491b
...@@ -850,10 +850,8 @@ int printDirectoryInfo(int fd, const char *name) ...@@ -850,10 +850,8 @@ int printDirectoryInfo(int fd, const char *name)
{ {
Directory *directory; Directory *directory;
if ((directory = getDirectory(name)) == NULL) { if ((directory = getDirectory(name)) == NULL)
commandError(fd, ACK_ERROR_NO_EXIST, "directory not found");
return -1; return -1;
}
printDirectoryList(fd, directory->subDirectories); printDirectoryList(fd, directory->subDirectories);
printSongInfoFromList(fd, directory->songs); printSongInfoFromList(fd, directory->songs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment