From 43f067c6e16cbad428e2d5ec11cd3094fb14a868 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 18 Sep 2017 05:04:11 +0200 Subject: StringUtil: support TryParse(u16*) --- Source/Core/Common/StringUtil.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'Source/Core/Common/StringUtil.cpp') diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 03e6bb3d45..445224757b 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -226,25 +226,27 @@ std::string StripQuotes(const std::string& s) return s; } -bool TryParse(const std::string& str, u32* const output) +bool TryParse(const std::string& str, u16* const output) { - char* endptr = nullptr; - - // Reset errno to a value other than ERANGE - errno = 0; - - unsigned long value = strtoul(str.c_str(), &endptr, 0); + u64 value; + if (!TryParse(str, &value)) + return false; - if (!endptr || *endptr) + if (value >= 0x10000ull && value <= 0xFFFFFFFFFFFF0000ull) return false; - if (errno == ERANGE) + *output = static_cast(value); + return true; +} + +bool TryParse(const std::string& str, u32* const output) +{ + u64 value; + if (!TryParse(str, &value)) return false; -#if ULONG_MAX > UINT_MAX if (value >= 0x100000000ull && value <= 0xFFFFFFFF00000000ull) return false; -#endif *output = static_cast(value); return true; -- cgit v1.2.3