From 20597b3632d3b6e25ba532716106f90d5b64d0e8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 28 Oct 2013 23:58:17 +0100 Subject: *: use nullptr instead of NULL --- src/Mapper.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Mapper.cxx') 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(); -- cgit v1.2.3