fs/AllocatedPath: make the nullptr_t constructor public

src/fs/AllocatedPath.hxx

@@ -43,7 +43,6 @@ class AllocatedPath {
 
 	string value;
 
-	AllocatedPath(std::nullptr_t):value() {}
 	explicit AllocatedPath(const_pointer_type _value):value(_value) {}
 
 	AllocatedPath(const_pointer_type _begin, const_pointer_type _end)
@@ -56,6 +55,14 @@ class AllocatedPath {
 		return AllocatedPath(PathTraitsFS::Build(a, a_size, b, b_size));
 	}
 public:
+	/**
+	 * Construct a "nulled" instance.  Its IsNull() method will
+	 * return true.  Such an object must not be used.
+	 *
+	 * @see IsNull()
+	 */
+	AllocatedPath(std::nullptr_t):value() {}
+
 	/**
 	 * Copy an #AllocatedPath object.
 	 */
@@ -70,17 +77,6 @@ public:
 
 	~AllocatedPath();
 
-	/**
-	 * Return a "nulled" instance.  Its IsNull() method will
-	 * return true.  Such an object must not be used.
-	 *
-	 * @see IsNull()
-	 */
-	gcc_const
-	static AllocatedPath Null() noexcept {
-		return AllocatedPath(nullptr);
-	}
-
 	gcc_pure
 	operator Path() const noexcept {
 		return Path::FromFS(c_str());

src/fs/FileSystem.cxx

@@ -45,15 +45,15 @@ ReadLink(Path path)
 #ifdef _WIN32
 	(void)path;
 	errno = EINVAL;
-	return AllocatedPath::Null();
+	return nullptr;
 #else
 	char buffer[MPD_PATH_MAX];
 	ssize_t size = readlink(path.c_str(), buffer, MPD_PATH_MAX);
 	if (size < 0)
-		return AllocatedPath::Null();
+		return nullptr;
 	if (size_t(size) >= MPD_PATH_MAX) {
 		errno = ENOMEM;
-		return AllocatedPath::Null();
+		return nullptr;
 	}
 	buffer[size] = '\0';
 	return AllocatedPath::FromFS(buffer);

src/fs/StandardDirectory.cxx

@@ -109,7 +109,7 @@ SafePathFromFS(PathTraitsFS::const_pointer_type dir)
 {
 	if (IsValidPathString(dir) && IsValidDir(dir))
 		return AllocatedPath::FromFS(dir);
-	return AllocatedPath::Null();
+	return nullptr;
 }
 #endif
 
@@ -120,7 +120,7 @@ static AllocatedPath GetStandardDir(int folder_id)
 	auto ret = SHGetFolderPath(nullptr, folder_id | CSIDL_FLAG_DONT_VERIFY,
 				   nullptr, SHGFP_TYPE_CURRENT, dir.data());
 	if (FAILED(ret))
-		return AllocatedPath::Null();
+		return nullptr;
 	return SafePathFromFS(dir.data());
 }
 #endif
@@ -185,7 +185,7 @@ ParseConfigLine(char *line, const char *dir_name, AllocatedPath &result_dir)
 	// build the result path
 	const char *path = line;
 
-	auto result = AllocatedPath::Null();
+	AllocatedPath result = nullptr;
 	if (home_relative) {
 		auto home = GetHomeDir();
 		if (home.IsNull())
@@ -205,7 +205,7 @@ ParseConfigLine(char *line, const char *dir_name, AllocatedPath &result_dir)
 static AllocatedPath
 GetUserDir(const char *name) noexcept
 try {
-	auto result = AllocatedPath::Null();
+	AllocatedPath result = nullptr;
 	auto config_dir = GetUserConfigDir();
 	if (config_dir.IsNull())
 		return result;
@@ -218,7 +218,7 @@ try {
 			return result;
 	return result;
 } catch (const std::exception &e) {
-	return AllocatedPath::Null();
+	return nullptr;
 }
 
 #endif
@@ -242,9 +242,9 @@ GetUserConfigDir() noexcept
 			return fallback;
 	}
 
-	return AllocatedPath::Null();
+	return nullptr;
 #else
-	return AllocatedPath::Null();
+	return nullptr;
 #endif
 }
 
@@ -258,7 +258,7 @@ GetUserMusicDir() noexcept
 #elif defined(ANDROID)
 	return Environment::getExternalStoragePublicDirectory("Music");
 #else
-	return AllocatedPath::Null();
+	return nullptr;
 #endif
 }
 
@@ -279,11 +279,11 @@ GetUserCacheDir() noexcept
 			return fallback;
 	}
 
-	return AllocatedPath::Null();
+	return nullptr;
 #elif defined(ANDROID)
 	return context->GetCacheDir(Java::GetEnv());
 #else
-	return AllocatedPath::Null();
+	return nullptr;
 #endif
 }
 
@@ -303,11 +303,11 @@ GetAppBaseDir() noexcept
 
 	// Check for error
 	if (ret == 0)
-		return AllocatedPath::Null();
+		return nullptr;
 
 	// Check for truncation
 	if (ret == app.size() && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-		return AllocatedPath::Null();
+		return nullptr;
 
 	auto app_path = AllocatedPath::FromFS(app.data());
 	return app_path.GetDirectoryName().GetDirectoryName();
@@ -326,7 +326,7 @@ GetHomeDir() noexcept
 	if (pw.ReadByUid(getuid()))
 		return SafePathFromFS(pw->pw_dir);
 #endif
-	return AllocatedPath::Null();
+	return nullptr;
 }
 
 AllocatedPath
@@ -340,7 +340,7 @@ GetHomeDir(const char *user_name) noexcept
 	if (pw.ReadByName(user_name))
 		return SafePathFromFS(pw->pw_dir);
 #endif
-	return AllocatedPath::Null();
+	return nullptr;
 }
 
 #endif