Changeset 25014 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Nov 26, 2009 3:26:36 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55327

Message:

RTStrVersionCompare: made it return the same as RTStrICmp (-1,0,1).

File:

• trunk/src/VBox/Runtime/common/string/strversion.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/string/strversion.cpp

@@ -111 +111 @@
      * Do a parallel parse of the strings.
      */
-    int iRes = 0;
     while (*pszVer1 || *pszVer2)
     {
@@ -127 +126 @@
         {
             if (uVal1 != uVal2)
-            {
-                iRes = uVal1 > uVal2 ? 1 : 2;
-                break;
-            }
+                return uVal1 < uVal2 ? -1 : 1;
         }
         else if (   !fNumeric1 && fNumeric2 && uVal2 == 0 && cchBlock1 == 0
@@ -144 +140 @@
                 iDiff = cchBlock1 < cchBlock2 ? -1 : 1;
             if (iDiff)
-            {
-                iRes = iDiff > 0 ? 1 : 2;
-                break;
-            }
+                return iDiff < 0 ? -1 : 1;
         }
     }
-    return iRes;
+    return 0;
 }
 RT_EXPORT_SYMBOL(RTStrVersionCompare);