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

Mapper: assert that Song::parent is not nullptr

Browse Source
This commit is contained in:
Max Kellermann 2014-01-31 23:14:13 +01:00
parent 78689645dc
commit ff650d50a2
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mapper.cxx
View File

@ -225,21 +225,6 @@ map_directory_child_fs(const Directory &directory, const char *name)
return AllocatedPath::Build(parent_fs, name_fs); return AllocatedPath::Build(parent_fs, name_fs);
} }
/**
* Map a song object that was created by song_dup_detached(). It does
* not have a real parent directory, only the dummy object
* #detached_root.
*/
static AllocatedPath
map_detached_song_fs(const char *uri_utf8)
{
auto uri_fs = AllocatedPath::FromUTF8(uri_utf8);
if (uri_fs.IsNull())
return uri_fs;
return AllocatedPath::Build(music_dir_fs, uri_fs);
}
DetachedSong DetachedSong
map_song_detach(const LightSong &song) map_song_detach(const LightSong &song)
{ {
@ -257,9 +242,9 @@ map_song_detach(const LightSong &song)
AllocatedPath AllocatedPath
map_song_fs(const Song &song) map_song_fs(const Song &song)
{ {
return song.parent == nullptr assert(song.parent != nullptr);
? map_detached_song_fs(song.uri)
: map_directory_child_fs(*song.parent, song.uri); return map_directory_child_fs(*song.parent, song.uri);
} }
#endif #endif