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

* Changed zelda::utility::countChar to use a pointer to lastOccur rather than a reference

This commit is contained in:
Antidote 2014-01-10 13:13:06 -08:00
parent 1e450a6785
commit 428438cf89
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/utility.hpp
View File

@ -47,7 +47,7 @@ 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);
int countChar(const std::string& str, const char chr, int& lastOccur); int countChar(const std::string& str, const char chr, int* lastOccur = NULL);
} // utility } // utility
} // zelda } // zelda

10
src/utility.cpp
View File

@ -171,11 +171,11 @@ bool parseBool(const std::string& boolean, bool &valid)
std::transform(val.begin(), val.end(), val.begin(), ::tolower); std::transform(val.begin(), val.end(), val.begin(), ::tolower);
// Check for true first // Check for true first
if (!val.compare("true") || !val.compare("1") || !val.compare("yes")) if (!val.compare("true") || !val.compare("1") || !val.compare("yes") || !val.compare("on"))
return (valid = true); return (valid = true);
// Now false // Now false
if (!val.compare("false") || !val.compare("0") || !val.compare("no")) if (!val.compare("false") || !val.compare("0") || !val.compare("no") || !val.compare("off"))
{ {
valid = true; valid = true;
return false; return false;
@ -186,7 +186,7 @@ bool parseBool(const std::string& boolean, bool &valid)
return (valid = false); return (valid = false);
} }
int countChar(const std::string &str, const char chr, int &lastOccur) int countChar(const std::string& str, const char chr, int* lastOccur)
{ {
int ret = 0; int ret = 0;
@ -195,7 +195,9 @@ int countChar(const std::string &str, const char chr, int &lastOccur)
{ {
if (c == chr) if (c == chr)
{ {
lastOccur = index; if (lastOccur != NULL)
*lastOccur = index;
ret++; ret++;
} }
index++; index++;