0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

version_info: Trim a copy of the input string in constructor

Browse source
This commit is contained in:
Ignacio R. Morelle 2011-03-23 01:23:00 +00:00
parent 06ac2794de
commit c3b421c4a3
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/version.cpp
View file

@ -47,7 +47,10 @@ version_info::version_info(const std::string& str)
, special_separator_('\0')
, sane_(true)
{
if(str.empty())
std::string v = str;
utils::strip(v);
if(v.empty())
return;
//
@ -56,10 +59,10 @@ version_info::version_info(const std::string& str)
//
// For 1.5.2 it is at npos.
//
const std::string::size_type breakpoint_pos = str.find_first_not_of(".0123456789");
const std::string::size_type breakpoint_pos = v.find_first_not_of(".0123456789");
std::string left_side;
if(breakpoint_pos != std::string::npos) {
const std::string right_side = str.substr(breakpoint_pos);
const std::string right_side = v.substr(breakpoint_pos);
assert(right_side.empty() == false);
if((right_side[0] >= 'A' && right_side[0] <= 'Z') || (right_side[0] >= 'a' && right_side[0] <= 'z')) {
@ -73,10 +76,10 @@ version_info::version_info(const std::string& str)
}
}
left_side = str.substr(0, breakpoint_pos);
left_side = v.substr(0, breakpoint_pos);
}
else {
left_side = str;
left_side = v;
}
const std::vector<std::string> components = utils::split(left_side, '.');