Commit 93598e28 authored by Max Kellermann's avatar Max Kellermann

stored_playlist: renamed and moved spl_delete() to stored_playlist.c

The function deletePlaylist() shouldn't be in playlist.c.
parent 39f0c41f
...@@ -626,7 +626,7 @@ handle_rm(struct client *client, mpd_unused int argc, char *argv[]) ...@@ -626,7 +626,7 @@ handle_rm(struct client *client, mpd_unused int argc, char *argv[])
{ {
enum playlist_result result; enum playlist_result result;
result = deletePlaylist(argv[1]); result = spl_delete(argv[1]);
return print_playlist_result(client, result); return print_playlist_result(client, result);
} }
......
...@@ -1185,20 +1185,6 @@ void shufflePlaylist(void) ...@@ -1185,20 +1185,6 @@ void shufflePlaylist(void)
} }
} }
enum playlist_result deletePlaylist(const char *utf8file)
{
char path_max_tmp[MPD_PATH_MAX];
utf8_to_fs_playlist_path(path_max_tmp, utf8file);
if (unlink(path_max_tmp) < 0)
return errno == ENOENT
? PLAYLIST_RESULT_NO_SUCH_LIST
: PLAYLIST_RESULT_ERRNO;
return PLAYLIST_RESULT_SUCCESS;
}
enum playlist_result savePlaylist(const char *utf8file) enum playlist_result savePlaylist(const char *utf8file)
{ {
FILE *fp; FILE *fp;
......
...@@ -109,8 +109,6 @@ void shufflePlaylist(void); ...@@ -109,8 +109,6 @@ void shufflePlaylist(void);
enum playlist_result savePlaylist(const char *utf8file); enum playlist_result savePlaylist(const char *utf8file);
enum playlist_result deletePlaylist(const char *utf8file);
void void
deleteASongFromPlaylist(const struct song *song); deleteASongFromPlaylist(const struct song *song);
......
...@@ -266,6 +266,21 @@ spl_clear(const char *utf8path) ...@@ -266,6 +266,21 @@ spl_clear(const char *utf8path)
} }
enum playlist_result enum playlist_result
spl_delete(const char *name_utf8)
{
char filename[MPD_PATH_MAX];
utf8_to_fs_playlist_path(filename, name_utf8);
if (unlink(filename) < 0)
return errno == ENOENT
? PLAYLIST_RESULT_NO_SUCH_LIST
: PLAYLIST_RESULT_ERRNO;
return PLAYLIST_RESULT_SUCCESS;
}
enum playlist_result
spl_remove_index(const char *utf8path, unsigned pos) spl_remove_index(const char *utf8path, unsigned pos)
{ {
GPtrArray *list; GPtrArray *list;
......
...@@ -54,6 +54,9 @@ enum playlist_result ...@@ -54,6 +54,9 @@ enum playlist_result
spl_clear(const char *utf8path); spl_clear(const char *utf8path);
enum playlist_result enum playlist_result
spl_delete(const char *name_utf8);
enum playlist_result
spl_remove_index(const char *utf8path, unsigned pos); spl_remove_index(const char *utf8path, unsigned pos);
enum playlist_result enum playlist_result
......
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