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

PlaylistFile: eliminate redundant spl_map() calls

Browse Source
This commit is contained in:
Max Kellermann
2015-03-24 21:34:07 +01:00
parent 7f3518333d
commit 8c9c3a91e6
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/PlaylistFile.cxx
View File

@@ -225,9 +225,6 @@ SavePlaylistFile(const PlaylistFileContents &contents, const char *utf8path,
{ {
assert(utf8path != nullptr); assert(utf8path != nullptr);
if (spl_map(error).IsNull())
return false;
const auto path_fs = spl_map_to_fs(utf8path, error); const auto path_fs = spl_map_to_fs(utf8path, error);
if (path_fs.IsNull()) if (path_fs.IsNull())
return false; return false;
@@ -250,9 +247,6 @@ LoadPlaylistFile(const char *utf8path, Error &error)
{ {
PlaylistFileContents contents; PlaylistFileContents contents;
if (spl_map(error).IsNull())
return contents;
const auto path_fs = spl_map_to_fs(utf8path, error); const auto path_fs = spl_map_to_fs(utf8path, error);
if (path_fs.IsNull()) if (path_fs.IsNull())
return contents; return contents;
@@ -345,9 +339,6 @@ spl_move_index(const char *utf8path, unsigned src, unsigned dest,
bool bool
spl_clear(const char *utf8path, Error &error) spl_clear(const char *utf8path, Error &error)
{ {
if (spl_map(error).IsNull())
return false;
const auto path_fs = spl_map_to_fs(utf8path, error); const auto path_fs = spl_map_to_fs(utf8path, error);
if (path_fs.IsNull()) if (path_fs.IsNull())
return false; return false;
@@ -404,9 +395,6 @@ spl_remove_index(const char *utf8path, unsigned pos, Error &error)
bool bool
spl_append_song(const char *utf8path, const DetachedSong &song, Error &error) spl_append_song(const char *utf8path, const DetachedSong &song, Error &error)
{ {
if (spl_map(error).IsNull())
return false;
const auto path_fs = spl_map_to_fs(utf8path, error); const auto path_fs = spl_map_to_fs(utf8path, error);
if (path_fs.IsNull()) if (path_fs.IsNull())
return false; return false;
@@ -481,9 +469,6 @@ spl_rename_internal(Path from_path_fs, Path to_path_fs,
bool bool
spl_rename(const char *utf8from, const char *utf8to, Error &error) spl_rename(const char *utf8from, const char *utf8to, Error &error)
{ {
if (spl_map(error).IsNull())
return false;
const auto from_path_fs = spl_map_to_fs(utf8from, error); const auto from_path_fs = spl_map_to_fs(utf8from, error);
if (from_path_fs.IsNull()) if (from_path_fs.IsNull())
return false; return false;