libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Parsebool

This commit is contained in:
Antidote 2014-01-11 10:27:29 -08:00
parent 428438cf89
commit 164dff3926
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/utility.hpp
View File

@ -45,7 +45,7 @@ std::vector<std::string> split(const std::string &s, char delim);
void tolower(std::string& str); void tolower(std::string& str);
void toupper(std::string& str); void toupper(std::string& str);
std::string sprintf(const char* fmt, ...); std::string sprintf(const char* fmt, ...);
bool parseBool(const std::string& boolean, bool &valid); bool parseBool(const std::string& boolean, bool* valid = NULL);
int countChar(const std::string& str, const char chr, int* lastOccur = NULL); int countChar(const std::string& str, const char chr, int* lastOccur = NULL);

16
src/utility.cpp
View File

@ -163,7 +163,7 @@ std::string sprintf(const char* fmt, ...)
return ret; return ret;
} }
bool parseBool(const std::string& boolean, bool &valid) bool parseBool(const std::string& boolean, bool* valid)
{ {
std::string val = boolean; std::string val = boolean;
// compare must be case insensitive // compare must be case insensitive
@ -172,18 +172,26 @@ bool parseBool(const std::string& boolean, bool &valid)
// Check for true first // Check for true first
if (!val.compare("true") || !val.compare("1") || !val.compare("yes") || !val.compare("on")) if (!val.compare("true") || !val.compare("1") || !val.compare("yes") || !val.compare("on"))
return (valid = true); {
if (valid)
*valid = true;
return true;
}
// Now false // Now false
if (!val.compare("false") || !val.compare("0") || !val.compare("no") || !val.compare("off")) if (!val.compare("false") || !val.compare("0") || !val.compare("no") || !val.compare("off"))
{ {
valid = true; if (valid)
*valid = true;
return false; return false;
} }
// Well that could've gone better // Well that could've gone better
return (valid = false); if (valid)
*valid = false;
return false;
} }
int countChar(const std::string& str, const char chr, int* lastOccur) int countChar(const std::string& str, const char chr, int* lastOccur)