ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a check to split for non-wide strings too

Browse Source
This commit is contained in:
Flakebi 2015-08-17 01:32:13 +02:00
parent eef55b04f8
commit 65c15fc19a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/utils/string_utils.cpp
View File

@ -168,7 +168,7 @@ namespace StringUtils
try try
{ {
std::string::size_type start=0; std::string::size_type start=0;
while(start!=std::string::npos && start<(unsigned int)s.size()) while(start < (unsigned int) s.size())
{ {
std::string::size_type i=s.find(c, start); std::string::size_type i=s.find(c, start);
if (i!=std::string::npos) if (i!=std::string::npos)
@ -186,11 +186,11 @@ namespace StringUtils
} }
else // end of string reached else // end of string reached
{ {
if (keepSplitChar) if (keepSplitChar && start != 0)
result.push_back(std::string(s,start-1)); result.push_back(std::string(s,start-1));
else else
result.push_back(std::string(s,start)); result.push_back(std::string(s,start));
start = i; return result;
} }
} }
return result; return result;
@ -251,7 +251,6 @@ namespace StringUtils
result.push_back( s.subString(start, s.size()-start) ); result.push_back( s.subString(start, s.size()-start) );
return result; return result;
//start = i+1;
} }
} }
return result; return result;