Skip to content

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

SongUpdate: make variables more local

parent e4322a71
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
src/SongUpdate.cxx
View file @ ad309cde
...@@ -44,21 +44,16 @@ ...@@ -44,21 +44,16 @@
Song * Song *
Song::LoadFile(const char *path_utf8, Directory &parent) Song::LoadFile(const char *path_utf8, Directory &parent)
{ {
Song *song;
bool ret;
assert(!uri_has_scheme(path_utf8)); assert(!uri_has_scheme(path_utf8));
assert(strchr(path_utf8, '\n') == nullptr); assert(strchr(path_utf8, '\n') == nullptr);
song = NewFile(path_utf8, parent); Song *song = NewFile(path_utf8, parent);
//in archive ? //in archive ?
if (parent.device == DEVICE_INARCHIVE) { bool success = parent.device == DEVICE_INARCHIVE
ret = song->UpdateFileInArchive(); ? song->UpdateFileInArchive()
} else { : song->UpdateFile();
ret = song->UpdateFile(); if (!success) {
}
if (!ret) {
song->Free(); song->Free();
return nullptr; return nullptr;
} }
......
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