citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

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.
This commit is contained in:
Lioncash 2018-11-13 14:09:05 -05:00 committed by fearlessTobi
parent 3d0339659a
commit cab8dc3824
2 changed files with 3 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/string_util.cpp
View File

@ -4,11 +4,11 @@
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include <cerrno>
#include <codecvt> #include <codecvt>
#include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <iomanip>
#include <locale>
#include <sstream>
#include "common/common_paths.h" #include "common/common_paths.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/string_util.h" #include "common/string_util.h"
@ -71,40 +71,6 @@ std::string StripQuotes(const std::string& s) {
return 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) { std::string StringFromBool(bool value) {
return value ? "True" : "False"; return value ? "True" : "False";
} }

17
src/common/string_util.h
View File

@ -5,8 +5,6 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <iomanip>
#include <sstream>
#include <string> #include <string>
#include <vector> #include <vector>
#include "common/common_types.h" #include "common/common_types.h"
@ -26,21 +24,6 @@ std::string StripQuotes(const std::string& s);
std::string StringFromBool(bool value); 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); std::string TabsToSpaces(int tab_size, std::string in);
void SplitString(const std::string& str, char delim, std::vector<std::string>& output); void SplitString(const std::string& str, char delim, std::vector<std::string>& output);