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

stored_playlist: spl_append_uri() returns enum playlist_result

Browse Source 
The return value of spl_append_uri() was somewhat buggy: some branches
returned ACK_* values, and some an enum playlist_result.  Unify this.
This commit is contained in:
Max Kellermann
2008-10-22 17:24:40 +02:00
parent d2606baa79
commit 3a164ef8e6
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/stored_playlist.c
View File

@@ -25,7 +25,6 @@
#include "ls.h" #include "ls.h"
#include "database.h" #include "database.h"
#include "idle.h" #include "idle.h"
#include "ack.h"
#include "os_compat.h" #include "os_compat.h"
static ListNode * static ListNode *
@@ -317,7 +316,7 @@ spl_append_song(const char *utf8path, struct song *song)
return PLAYLIST_RESULT_SUCCESS; return PLAYLIST_RESULT_SUCCESS;
} }
int enum playlist_result
spl_append_uri(const char *url, const char *utf8file) spl_append_uri(const char *url, const char *utf8file)
{ {
struct song *song; struct song *song;
@@ -327,7 +326,7 @@ spl_append_uri(const char *url, const char *utf8file)
return spl_append_song(utf8file, song); return spl_append_song(utf8file, song);
if (!isValidRemoteUtf8Url(url)) if (!isValidRemoteUtf8Url(url))
return ACK_ERROR_NO_EXIST; return PLAYLIST_RESULT_NO_SUCH_SONG;
song = song_remote_new(url); song = song_remote_new(url);
if (song) { if (song) {
@@ -336,7 +335,7 @@ spl_append_uri(const char *url, const char *utf8file)
return ret; return ret;
} }
return ACK_ERROR_NO_EXIST; return PLAYLIST_RESULT_NO_SUCH_SONG;
} }
enum playlist_result enum playlist_result

2
src/stored_playlist.h
View File

@@ -39,7 +39,7 @@ spl_remove_index(const char *utf8path, int pos);
enum playlist_result enum playlist_result
spl_append_song(const char *utf8path, struct song *song); spl_append_song(const char *utf8path, struct song *song);
int enum playlist_result
spl_append_uri(const char *file, const char *utf8file); spl_append_uri(const char *file, const char *utf8file);
enum playlist_result enum playlist_result