diff options
Diffstat (limited to 'src/wcstringutil.cpp')
-rw-r--r-- | src/wcstringutil.cpp | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp index b752409b..3983eb53 100644 --- a/src/wcstringutil.cpp +++ b/src/wcstringutil.cpp @@ -1,24 +1,18 @@ -/** \file wcstringutil.cpp - -Helper functions for working with wcstring -*/ -#include "common.h" +// Helper functions for working with wcstring. #include "wcstringutil.h" +#include "common.h" typedef wcstring::size_type size_type; -wcstring_range wcstring_tok(wcstring& str, const wcstring &needle, wcstring_range last) -{ +wcstring_range wcstring_tok(wcstring& str, const wcstring& needle, wcstring_range last) { size_type pos = last.second == wcstring::npos ? wcstring::npos : last.first; if (pos != wcstring::npos && last.second != wcstring::npos) pos += last.second; if (pos != wcstring::npos && pos != 0) ++pos; - if (pos == wcstring::npos || pos >= str.size()) - { + if (pos == wcstring::npos || pos >= str.size()) { return std::make_pair(wcstring::npos, wcstring::npos); } - if (needle.empty()) - { + if (needle.empty()) { return std::make_pair(pos, wcstring::npos); } @@ -26,12 +20,9 @@ wcstring_range wcstring_tok(wcstring& str, const wcstring &needle, wcstring_rang if (pos == wcstring::npos) return std::make_pair(wcstring::npos, wcstring::npos); size_type next_pos = str.find_first_of(needle, pos); - if (next_pos == wcstring::npos) - { + if (next_pos == wcstring::npos) { return std::make_pair(pos, wcstring::npos); - } - else - { + } else { str[next_pos] = L'\0'; return std::make_pair(pos, next_pos - pos); } |