diff options
| author | Mr. Myxa <thisisandrew0110@gmail.com> | 2026-03-22 00:40:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-21 23:40:52 +0000 |
| commit | bf31f642b08a8d8ca796a1b713285f2580805c2f (patch) | |
| tree | c58482bb0f0be3889b1c8c8c56bf017d3a03582f /src | |
| parent | 635abdd1c22cbb71216a6d9bf03d93c8d9a30184 (diff) | |
internal: rewrite deviceNameToInternalString using a single range pipeline (#13806)
Diffstat (limited to 'src')
| -rw-r--r-- | src/helpers/MiscFunctions.cpp | 18 | ||||
| -rw-r--r-- | src/helpers/MiscFunctions.hpp | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp index f79cad31..2a200f1e 100644 --- a/src/helpers/MiscFunctions.cpp +++ b/src/helpers/MiscFunctions.cpp @@ -927,12 +927,18 @@ std::expected<std::string, std::string> binaryNameForPid(pid_t pid) { return fullPath; } -std::string deviceNameToInternalString(std::string in) { - std::ranges::replace(in, ' ', '-'); - std::ranges::replace(in, '\n', '-'); - std::ranges::replace(in, ',', '-'); - std::ranges::transform(in, in.begin(), ::tolower); - return in; +std::string deviceNameToInternalString(const std::string& in) { + auto result = in | std::views::transform([](unsigned char ch) -> char { + switch (ch) { + case ' ': + case '\n': + case ',': return '-'; + + default: return static_cast<char>(std::tolower(ch)); + } + }); + + return result | std::ranges::to<std::string>(); } static const std::vector<const char*> PKGCONF_PATHS = {"/usr/lib/pkgconfig", "/usr/local/lib/pkgconfig"}; diff --git a/src/helpers/MiscFunctions.hpp b/src/helpers/MiscFunctions.hpp index b01c2bb8..26c5c7ad 100644 --- a/src/helpers/MiscFunctions.hpp +++ b/src/helpers/MiscFunctions.hpp @@ -42,7 +42,7 @@ float stringToPercentage(const std::string& VA bool isNvidiaDriverVersionAtLeast(int threshold); std::expected<std::string, std::string> binaryNameForWlClient(wl_client* client); std::expected<std::string, std::string> binaryNameForPid(pid_t pid); -std::string deviceNameToInternalString(std::string in); +std::string deviceNameToInternalString(const std::string& in); std::string getSystemLibraryVersion(const std::string& name); std::string getBuiltSystemLibraryNames(); bool truthy(const std::string& str); |
