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

SongUpdate: make variables more local

Browse Source
This commit is contained in:
Max Kellermann 2014-02-06 18:58:24 +01:00
parent e4322a716c
commit ad309cdeae
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/SongUpdate.cxx
View File

@ -44,21 +44,16 @@
Song *
Song::LoadFile(const char *path_utf8, Directory &parent)
{
Song *song;
bool ret;
assert(!uri_has_scheme(path_utf8));
assert(strchr(path_utf8, '\n') == nullptr);
song = NewFile(path_utf8, parent);
Song *song = NewFile(path_utf8, parent);
//in archive ?
if (parent.device == DEVICE_INARCHIVE) {
ret = song->UpdateFileInArchive();
} else {
ret = song->UpdateFile();
}
if (!ret) {
bool success = parent.device == DEVICE_INARCHIVE
? song->UpdateFileInArchive()
: song->UpdateFile();
if (!success) {
song->Free();
return nullptr;
}