From: Joel Rosdahl Date: Sun, 14 Jan 2024 09:36:10 +0000 (+0100) Subject: refactor: fs::path-ify util::is_dev_null_path X-Git-Tag: v4.10~129 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=470302017003ab3d831026ae092aeb1fee8ecf5d;p=thirdparty%2Fccache.git refactor: fs::path-ify util::is_dev_null_path --- diff --git a/src/util/path.hpp b/src/util/path.hpp index a6fc7ab9e..4e9484339 100644 --- a/src/util/path.hpp +++ b/src/util/path.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2021-2023 Joel Rosdahl and other contributors +// Copyright (C) 2021-2024 Joel Rosdahl and other contributors // // See doc/AUTHORS.adoc for a complete list of contributors. // @@ -46,7 +46,7 @@ std::string apparent_cwd(const std::string& actual_cwd); const char* get_dev_null_path(); // Return whether `path` is /dev/null or (on Windows) NUL. -bool is_dev_null_path(std::string_view path); +bool is_dev_null_path(const std::filesystem::path& path); // Return whether `path` includes at least one directory separator. bool is_full_path(std::string_view path); @@ -58,11 +58,11 @@ bool path_starts_with(std::string_view path, std::string_view prefix); // --- Inline implementations --- inline bool -is_dev_null_path(const std::string_view path) +is_dev_null_path(const std::filesystem::path& path) { return path == "/dev/null" #ifdef _WIN32 - || util::to_lowercase(path) == "nul" + || util::to_lowercase(path.string()) == "nul" #endif ; }