diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-19 18:19:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-19 18:19:03 +0200 |
| commit | 59f8144c50765189594d5932fc25869f9ea6e265 (patch) | |
| tree | f460d9f46a99040dea402bcb3ad2d84a0e734285 /src/UpdateSong.cxx | |
| parent | 5a7c931293b55a27c3f79c6951707a8d6e2a5f6c (diff) | |
| download | mpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.gz mpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.xz mpd-59f8144c50765189594d5932fc25869f9ea6e265.zip | |
*: use nullptr instead of NULL
Diffstat (limited to 'src/UpdateSong.cxx')
| -rw-r--r-- | src/UpdateSong.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/UpdateSong.cxx b/src/UpdateSong.cxx index 3aef2b560..d8aa80088 100644 --- a/src/UpdateSong.cxx +++ b/src/UpdateSong.cxx @@ -46,7 +46,7 @@ update_song_file2(Directory *directory, FormatError(update_domain, "no read permissions on %s/%s", directory->GetPath(), name); - if (song != NULL) { + if (song != nullptr) { db_lock(); delete_song(directory, song); db_unlock(); @@ -55,10 +55,10 @@ update_song_file2(Directory *directory, return; } - if (!(song != NULL && st->st_mtime == song->mtime && + if (!(song != nullptr && st->st_mtime == song->mtime && !walk_discard) && update_container_file(directory, name, st, plugin)) { - if (song != NULL) { + if (song != nullptr) { db_lock(); delete_song(directory, song); db_unlock(); @@ -67,11 +67,11 @@ update_song_file2(Directory *directory, return; } - if (song == NULL) { + if (song == nullptr) { FormatDebug(update_domain, "reading %s/%s", directory->GetPath(), name); song = Song::LoadFile(name, directory); - if (song == NULL) { + if (song == nullptr) { FormatDebug(update_domain, "ignoring unrecognized file %s/%s", directory->GetPath(), name); @@ -108,7 +108,7 @@ update_song_file(Directory *directory, { const struct decoder_plugin *plugin = decoder_plugin_from_suffix(suffix, nullptr); - if (plugin == NULL) + if (plugin == nullptr) return false; update_song_file2(directory, name, st, plugin); |