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

playlist: don't use isPlaylist() in deletePlaylist()

Browse Source 
The only caller of deletePlaylist() appends PLAYLIST_FILE_SUFFIX, so
we can be sure it's already there.  We don't need to stat the file,
since unlink() does all the checking.
This commit is contained in:
Max Kellermann 2008-10-13 16:30:44 +02:00
parent 07c9b62764
commit bc85e92a72
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ls.c
View File

@ -228,22 +228,6 @@ const char *getSuffix(const char *utf8file)
return ret;
}
static int hasSuffix(const char *utf8file, const char *suffix)
{
const char *s = getSuffix(utf8file);
if (s && 0 == strcmp(s, suffix))
return 1;
return 0;
}
int isPlaylist(const char *utf8file)
{
if (isFile(utf8file, NULL)) {
return hasSuffix(utf8file, PLAYLIST_FILE_SUFFIX);
}
return 0;
}
int isDir(const char *utf8name)
{
struct stat st;

2
src/ls.h
View File

@ -38,8 +38,6 @@ int myStat(const char *utf8file, struct stat *st);
int isDir(const char *utf8name);
int isPlaylist(const char *utf8file);
struct decoder_plugin *hasMusicSuffix(const char *utf8file, unsigned int next);
struct decoder_plugin *isMusic(const char *utf8file, time_t * mtime,

7
src/playlist.c
View File

@ -1185,11 +1185,10 @@ enum playlist_result deletePlaylist(const char *utf8file)
utf8_to_fs_playlist_path(path_max_tmp, utf8file);
if (!isPlaylist(path_max_tmp))
return PLAYLIST_RESULT_NO_SUCH_LIST;
if (unlink(path_max_tmp) < 0)
return PLAYLIST_RESULT_ERRNO;
return errno == ENOENT
? PLAYLIST_RESULT_NO_SUCH_LIST
: PLAYLIST_RESULT_ERRNO;
return PLAYLIST_RESULT_SUCCESS;
}