diff options
author | Lioncash <mathew1800@gmail.com> | 2018-11-13 20:09:05 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-11-14 00:13:45 +0100 |
commit | f1219e3a874bb16f2928e8b9e879f2a4ddf22ab7 (patch) | |
tree | f74eecf8914cc377b8b7af64f6d50d33edafba1f | |
parent | string_util: Remove ThousandSeparate() (diff) | |
download | yuzu-f1219e3a874bb16f2928e8b9e879f2a4ddf22ab7.tar yuzu-f1219e3a874bb16f2928e8b9e879f2a4ddf22ab7.tar.gz yuzu-f1219e3a874bb16f2928e8b9e879f2a4ddf22ab7.tar.bz2 yuzu-f1219e3a874bb16f2928e8b9e879f2a4ddf22ab7.tar.lz yuzu-f1219e3a874bb16f2928e8b9e879f2a4ddf22ab7.tar.xz yuzu-f1219e3a874bb16f2928e8b9e879f2a4ddf22ab7.tar.zst yuzu-f1219e3a874bb16f2928e8b9e879f2a4ddf22ab7.zip |
-rw-r--r-- | src/common/string_util.cpp | 40 | ||||
-rw-r--r-- | 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 731d1db34..5b004ef48 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -4,11 +4,11 @@ #include <algorithm> #include <cctype> -#include <cerrno> #include <codecvt> -#include <cstdio> #include <cstdlib> -#include <cstring> +#include <iomanip> +#include <locale> +#include <sstream> #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<u32>(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 f76fc43dc..7e32d6405 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -5,8 +5,6 @@ #pragma once #include <cstddef> -#include <iomanip> -#include <sstream> #include <string> #include <vector> #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 <typename N> -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<std::string>& output); |