From 9bc18eada8075a52ee4a2e89df57fc213e1aa689 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 13 Nov 2018 14:04:24 -0500 Subject: [PATCH 1/3] string_util: Remove ThousandSeparate() This is currently unused and doesn't really provide much value to keep around either. --- src/common/string_util.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/common/string_util.h b/src/common/string_util.h index 32bf6a19c4..f76fc43dc5 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -26,20 +26,6 @@ std::string StringFromBuffer(const std::vector& data); std::string StripSpaces(const std::string& s); std::string StripQuotes(const std::string& s); -// Thousand separator. Turns 12345678 into 12,345,678 -template -std::string ThousandSeparate(I value, int spaces = 0) { - std::ostringstream oss; - -// std::locale("") seems to be broken on many platforms -#if defined _WIN32 || (defined __linux__ && !defined __clang__) - oss.imbue(std::locale("")); -#endif - oss << std::setw(spaces) << value; - - return oss.str(); -} - std::string StringFromBool(bool value); bool TryParse(const std::string& str, bool* output); From f1219e3a874bb16f2928e8b9e879f2a4ddf22ab7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 13 Nov 2018 14:09:05 -0500 Subject: [PATCH 2/3] string_util: Remove TryParse() This is an unused hold-over from Dolphin that was primarily used to parse values out of the .ini files. Given we already have libraries that do this for us, we don't need to keep this around. --- src/common/string_util.cpp | 40 +++----------------------------------- src/common/string_util.h | 17 ---------------- 2 files changed, 3 insertions(+), 54 deletions(-) diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 731d1db34d..5b004ef48b 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -4,11 +4,11 @@ #include #include -#include #include -#include #include -#include +#include +#include +#include #include "common/common_paths.h" #include "common/logging/log.h" #include "common/string_util.h" @@ -75,40 +75,6 @@ std::string StripQuotes(const std::string& s) { return s; } -bool TryParse(const std::string& str, u32* const output) { - char* endptr = nullptr; - - // Reset errno to a value other than ERANGE - errno = 0; - - unsigned long value = strtoul(str.c_str(), &endptr, 0); - - if (!endptr || *endptr) - return false; - - if (errno == ERANGE) - return false; - -#if ULONG_MAX > UINT_MAX - if (value >= 0x100000000ull && value <= 0xFFFFFFFF00000000ull) - return false; -#endif - - *output = static_cast(value); - return true; -} - -bool TryParse(const std::string& str, bool* const output) { - if ("1" == str || "true" == ToLower(str)) - *output = true; - else if ("0" == str || "false" == ToLower(str)) - *output = false; - else - return false; - - return true; -} - std::string StringFromBool(bool value) { return value ? "True" : "False"; } diff --git a/src/common/string_util.h b/src/common/string_util.h index f76fc43dc5..7e32d6405b 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -5,8 +5,6 @@ #pragma once #include -#include -#include #include #include #include "common/common_types.h" @@ -28,21 +26,6 @@ std::string StripQuotes(const std::string& s); std::string StringFromBool(bool value); -bool TryParse(const std::string& str, bool* output); -bool TryParse(const std::string& str, u32* output); - -template -static bool TryParse(const std::string& str, N* const output) { - std::istringstream iss(str); - - N tmp = 0; - if (iss >> tmp) { - *output = tmp; - return true; - } else - return false; -} - std::string TabsToSpaces(int tab_size, std::string in); void SplitString(const std::string& str, char delim, std::vector& output); From c7387e6504db0548fc5dafec5a27ce6923e58db7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 13 Nov 2018 14:11:34 -0500 Subject: [PATCH 3/3] string_util: Remove ArrayToString() An old function from Dolphin. This is also unused, and pretty inflexible when it comes to printing out different data types (for example, one might not want to print out an array of u8s but a different type instead. Given we use fmt, there's no need to keep this implementation of the function around. --- src/common/string_util.cpp | 19 ------------------- src/common/string_util.h | 2 -- 2 files changed, 21 deletions(-) diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 5b004ef48b..14f7037d85 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include "common/common_paths.h" @@ -33,24 +32,6 @@ std::string ToUpper(std::string str) { return str; } -// For Debugging. Read out an u8 array. -std::string ArrayToString(const u8* data, std::size_t size, int line_len, bool spaces) { - std::ostringstream oss; - oss << std::setfill('0') << std::hex; - - for (int line = 0; size; ++data, --size) { - oss << std::setw(2) << (int)*data; - - if (line_len == ++line) { - oss << '\n'; - line = 0; - } else if (spaces) - oss << ' '; - } - - return oss.str(); -} - std::string StringFromBuffer(const std::vector& data) { return std::string(data.begin(), std::find(data.begin(), data.end(), '\0')); } diff --git a/src/common/string_util.h b/src/common/string_util.h index 7e32d6405b..08f96533b6 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -17,8 +17,6 @@ std::string ToLower(std::string str); /// Make a string uppercase std::string ToUpper(std::string str); -std::string ArrayToString(const u8* data, std::size_t size, int line_len = 20, bool spaces = true); - std::string StringFromBuffer(const std::vector& data); std::string StripSpaces(const std::string& s);