diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/FacebookRM/src/utils.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/protocols/FacebookRM/src/utils.cpp b/protocols/FacebookRM/src/utils.cpp index ce46bdbfe6..23f4ff4417 100644 --- a/protocols/FacebookRM/src/utils.cpp +++ b/protocols/FacebookRM/src/utils.cpp @@ -334,14 +334,11 @@ std::string utils::text::slashu_to_utf8(std::string data) std::string utils::text::trim(std::string data, bool rtrim)
{
- if (data.empty())
- return "";
-
- std::string spaces = " \t\r\n"; // TODO: include "nbsp"?
+ std::string spaces = " \t\r\n";
std::string::size_type begin = rtrim ? 0 : data.find_first_not_of(spaces);
- std::string::size_type end = data.find_last_not_of(spaces) + 1;
+ std::string::size_type end = data.find_last_not_of(spaces);
- return (begin != std::string::npos && end != std::string::npos) ? data.substr(begin, end - begin) : "";
+ return (end != std::string::npos) ? data.substr(begin, end + 1 - begin) : "";
}
void utils::text::explode(std::string str, std::string separator, std::vector<std::string>* results)
|