diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
| commit | 20597b3632d3b6e25ba532716106f90d5b64d0e8 (patch) | |
| tree | fa6dabaff127150caf3cf4723257f15ef2c3e0f8 /src/Mapper.cxx | |
| parent | 4728735acf20fba24d0d03ab431160e250325869 (diff) | |
| download | mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.gz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.xz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.zip | |
*: use nullptr instead of NULL
Diffstat (limited to '')
| -rw-r--r-- | src/Mapper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Mapper.cxx b/src/Mapper.cxx index ebc9f89df..08597732a 100644 --- a/src/Mapper.cxx +++ b/src/Mapper.cxx @@ -156,7 +156,7 @@ map_to_relative_path(const char *path_utf8) AllocatedPath map_uri_fs(const char *uri) { - assert(uri != NULL); + assert(uri != nullptr); assert(*uri != '/'); if (music_dir_fs.IsNull()) @@ -186,7 +186,7 @@ map_directory_child_fs(const Directory &directory, const char *name) assert(!music_dir_fs.IsNull()); /* check for invalid or unauthorized base names */ - if (*name == 0 || strchr(name, '/') != NULL || + if (*name == 0 || strchr(name, '/') != nullptr || strcmp(name, ".") == 0 || strcmp(name, "..") == 0) return AllocatedPath::Null(); |