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/UpdateContainer.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/UpdateContainer.cxx')
| -rw-r--r-- | src/UpdateContainer.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/UpdateContainer.cxx b/src/UpdateContainer.cxx index 54328fe14..6e0cadfb7 100644 --- a/src/UpdateContainer.cxx +++ b/src/UpdateContainer.cxx @@ -37,7 +37,7 @@ /** * Create the specified directory object if it does not exist already * or if the #stat object indicates that it has been modified since - * the last update. Returns NULL when it exists already and is + * the last update. Returns nullptr when it exists already and is * unmodified. * * The caller must lock the database. @@ -49,10 +49,10 @@ make_directory_if_modified(Directory *parent, const char *name, Directory *directory = parent->FindChild(name); // directory exists already - if (directory != NULL) { + if (directory != nullptr) { if (directory->mtime == st->st_mtime && !walk_discard) { /* not modified */ - return NULL; + return nullptr; } delete_directory(directory); @@ -70,12 +70,12 @@ update_container_file(Directory *directory, const struct stat *st, const struct decoder_plugin *plugin) { - if (plugin->container_scan == NULL) + if (plugin->container_scan == nullptr) return false; db_lock(); Directory *contdir = make_directory_if_modified(directory, name, st); - if (contdir == NULL) { + if (contdir == nullptr) { /* not modified */ db_unlock(); return true; @@ -89,7 +89,7 @@ update_container_file(Directory *directory, char *vtrack; unsigned int tnum = 0; TagBuilder tag_builder; - while ((vtrack = plugin->container_scan(pathname.c_str(), ++tnum)) != NULL) { + while ((vtrack = plugin->container_scan(pathname.c_str(), ++tnum)) != nullptr) { Song *song = Song::NewFile(vtrack, contdir); // shouldn't be necessary but it's there.. |