[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/kdecore
From:       Hamish Rodda <rodda () kde ! org>
Date:       2005-06-11 15:20:32
Message-ID: 1118503232.353365.32343.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 424348 by rodda:

Fix my fix, hope it's right this time.
I changed the code to show its intention better as well.

CCMAIL: Woebbeking@onlinehome.de


 M  +6 -4      kmacroexpander.cpp  


--- branches/work/kde4/kdelibs/kdecore/kmacroexpander.cpp #424347:424348
@@ -414,13 +414,15 @@
     int sl, rsl, rpos;
     if (str[pos + 1] == '{') {
         rpos = pos + 2;
-        for (sl = 0; str.length() > rpos + sl && str[rpos + sl] != '}'; sl++)
-            if (rpos + sl >= str.length())
-                return 0;
+        sl = str.indexOf('}', rpos);
+        if (sl == -1)
+            return 0;
+        else
+          sl -= rpos;
         rsl = sl + 3;
     } else {
         rpos = pos + 1;
-        for (sl = 0; str.length() > rpos + sl && isIdentifier( str[rpos + sl] ); sl++);
+        for (sl = 0; (rpos + sl < str.length()) && isIdentifier( str[rpos + sl] ); sl++);
         rsl = sl + 1;
     }
     if (!sl)
[prev in list] [next in list] [prev in thread] [next in thread]