[Wesnoth-commits] r48982 - /trunk/src/version.cpp

[shadowm2006]

Author: shadowmaster
Date: Wed Mar 23 02:23:00 2011
New Revision: 48982

URL: http://svn.gna.org/viewcvs/wesnoth?rev=48982&view=rev
Log:
version_info: Trim a copy of the input string in constructor

Modified:
    trunk/src/version.cpp

Modified: trunk/src/version.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/version.cpp?rev=48982&r1=48981&r2=48982&view=diff
==============================================================================
--- trunk/src/version.cpp (original)
+++ trunk/src/version.cpp Wed Mar 23 02:23:00 2011
@@ -47,7 +47,10 @@
        , special_separator_('\0')
        , sane_(true)
 {
-       if(str.empty())
+       std::string v = str;
+       utils::strip(v);
+
+       if(v.empty())
                return;
 
        //
@@ -56,10 +59,10 @@
        //
        // 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 @@
                        }
                }
 
-               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, 
'.');


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits