qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 18:23:08 +02:00
Code

Clean up trim() utility function

Browse Source
This commit is contained in:
Maarten ter Huurne 2014-07-19 02:32:30 +02:00
parent 5e31df9e0f
commit 9b93eabcc5
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/utilities.cpp
View File

@ -40,15 +40,10 @@ bool case_less::operator()(const string &left, const string &right) const {
return strcasecmp(left.c_str(), right.c_str()) < 0; return strcasecmp(left.c_str(), right.c_str()) < 0;
} }
// General tool to strip spaces from both ends:
string trim(const string& s) { string trim(const string& s) {
if(s.length() == 0) auto b = s.find_first_not_of(" \t\r");
return s; auto e = s.find_last_not_of(" \t\r");
int b = s.find_first_not_of(" \t\r"); return b == string::npos ? "" : string(s, b, e + 1 - b);
int e = s.find_last_not_of(" \t\r");
if(b == -1) // No non-spaces
return "";
return string(s, b, e - b + 1);
} }
bool fileExists(const string &file) { bool fileExists(const string &file) {

2
src/utilities.h
View File

@ -35,7 +35,9 @@ public:
bool operator()(const std::string &left, const std::string &right) const; bool operator()(const std::string &left, const std::string &right) const;
}; };
/** Returns the string with whitespace stripped from both ends. */
std::string trim(const std::string& s); std::string trim(const std::string& s);
std::string strreplace(std::string orig, const std::string &search, const std::string &replace); std::string strreplace(std::string orig, const std::string &search, const std::string &replace);
std::string cmdclean(std::string cmdline); std::string cmdclean(std::string cmdline);