diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-11-13 14:09:05 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-11-13 18:13:45 -0500 |
| commit | f1219e3a874bb16f2928e8b9e879f2a4ddf22ab7 (patch) | |
| tree | f74eecf8914cc377b8b7af64f6d50d33edafba1f /src/common/string_util.cpp | |
| parent | 9bc18eada8075a52ee4a2e89df57fc213e1aa689 (diff) | |
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.
Diffstat (limited to 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 40 |
1 files changed, 3 insertions, 37 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 <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"; } |