Changeset 24639 in vbox for trunk/src/VBox/Runtime

Timestamp:

Nov 13, 2009 4:09:36 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: Added RTStrVersionToUInt32() with testcase.

Location:

trunk/src/VBox/Runtime

Files:

• common/string/strtonum.cpp (modified) (2 diffs)
• testcase/tstStrToVer.cpp (modified) (3 diffs)

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

@@ -33 +33 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#include <iprt/mem.h>
 #include <iprt/string.h>
 #include "internal/iprt.h"
 
+#include <iprt/ctype.h> /* needed for RT_C_IS_DIGIT */
 #include <iprt/err.h>
 
@@ -90 +92 @@
 */
 
+
+/**
+ * Converts a string representation of a version number to an unsigned number.
+ *
+ * @returns iprt status code.
+ *          Warnings are used to indicate convertion problems.
+ * @retval  VWRN_NUMBER_TOO_BIG
+ * @retval  VWRN_TRAILING_CHARS
+ * @retval  VWRN_TRAILING_SPACES
+ * @retval  VINF_SUCCESS
+ * @retval  VERR_NO_MEMORY
+ * @retval  VERR_NO_DIGITS
+ *
+ * @param   pszValue    Pointer to the string value.
+ * @param   pu32        Where to store the converted number.
+ */
+int RTStrVersionToUInt32(const char *pszVer, uint32_t *pu32)
+{
+    const char *str = pszVer;
+    AssertPtr(pu32);
+    AssertPtr(str);
+
+    char *strNew = (char*)RTMemAllocZ((strlen(pszVer) + 1) * sizeof(char));
+    if (strNew == NULL)
+        return VERR_NO_MEMORY;
+
+    int rc = VERR_NO_DIGITS;
+    uint16_t c = 0;
+    bool fLastInvalid = false;
+    while (    str
+           && *str != '\0')
+    {
+        if (fLastInvalid)
+        {
+            if (   *str == '-'
+                || *str == '_')
+            {
+                fLastInvalid = false;
+            }
+        }
+        else
+        {
+            if (RT_C_IS_DIGIT(*str))
+            {
+                strNew[c++] = *str;
+            }
+            else if (   *str != '.'
+                     && c == 0)
+            {
+                fLastInvalid = true;
+            }
+        }
+        str++;
+    }
+    strNew[c] = '\0';
+
+    /* Convert final number string to number */
+    if (fLastInvalid)
+    {
+        *pu32 = 0;
+        rc = VERR_NO_DIGITS;
+    }
+    else
+    {
+        rc = RTStrToUInt32Ex(strNew,
+                             NULL,       /* Next pointer, not used */
+                             10          /* Number base */,
+                             pu32);
+        if (rc != VINF_SUCCESS)
+            *pu32 = 0;
+    }
+    RTStrFree(strNew);
+    return rc;
+}
 
 

trunk/src/VBox/Runtime/testcase/tstStrToVer.cpp

@@ -32 +32 @@
 #include <iprt/stream.h>
 #include <iprt/err.h>
-
-
-#include <iprt/assert.h>
-
-int RTStrVersionToUInt32(const char *pszVer, uint32_t *pu32)
-{
-    char *str = RTStrDup(pszVer);
-    AssertPtr(pu32);
-    AssertPtr(str);
-
-    char *c = RTStrStrip(str);
-    char *next;
-    char n = '.';
-    int rc;
-    uint32_t t;
-
-    *pu32 = 0;
-
-    char szDelim[] = { '-', '_' };
-
-    /* Get trailing content separated by dash (-) or underscore (_)*/
-    //c = RTStrStr(c, &n)
-    c = strchr(c, '-');
-    if (c)
-        c++; /* Skip dash */
-    else
-        c = str;
-
-    /* Get last digit */
-    rc = RTStrToUInt32Ex(c,
-                         &next,
-                         10 /* number base */,
-                         &t);
-    *pu32 += t;
-    RTStrFree(str);
-    return rc;
-}
 
 
@@ -110 +73 @@
 {
     int cErrors = 0;
-    int rc;
-
-    uint32_t l;
-    rc = RTStrVersionToUInt32("asdf--234", &l);
-    RTPrintf("num: %ld\n", l);
-
 
     static const struct TstU32 aTstU32[] =
     {
-        { "asdf",                       VERR_NO_DIGITS, 0 },
-        { "123",                        VINF_SUCCESS, 123 },
-        { "45.63",                      VINF_SUCCESS, 4563 },
-        { "68.54.123",                  VINF_SUCCESS, 6854123 },
-        { "aasdf-1",                    VINF_SUCCESS, 1 },
-        { "qwer-123.34",                VINF_SUCCESS, 12334 },
-        { "aasdf45-r4545-5",            VINF_SUCCESS, 5 },
-        { "foo41-r2431-6.9.8",          VINF_SUCCESS, 698 },
-        { "bar43-r3517-7.1.2-beta",     VINF_SUCCESS, 712 },
-        { "bar43-r3517-7.1.2.534-beta", VWRN_NUMBER_TOO_BIG, 0 },
+        { "asdf",                               VERR_NO_DIGITS, 0 },
+        { "asdf234",                            VERR_NO_DIGITS, 0 },
+        { "123",                                VINF_SUCCESS, 123 },
+        { "45.63",                              VINF_SUCCESS, 4563 },
+        { "68.54.123",                          VINF_SUCCESS, 6854123 },
+        { "1.0.3-asdf",                         VINF_SUCCESS, 103 },
+        { "aasdf-1",                            VINF_SUCCESS, 1 },
+        { "qwer-123.34",                        VINF_SUCCESS, 12334 },
+        { "aasdf45-r4545-5",                    VINF_SUCCESS, 5 },
+        { "foo41-r2431-6.9.8",                  VINF_SUCCESS, 698 },
+        { "bar43-r3517-7.1.2-beta",             VINF_SUCCESS, 712 },
+        { "bar43-r3517-7.1.2.53412344556-beta", VWRN_NUMBER_TOO_BIG, 0 },
     };
     RUN_TESTS(aTstU32, uint32_t, "%#ld", RTStrVersionToUInt32);
@@ -139 +98 @@
     else
         RTPrintf("tstStrToVer: FAILURE - %d errors\n", cErrors);
-    //return !!cErrors;
-    return 0; /* Don't report any failure yet, makes test boxes unhappy */
+    return !!cErrors;
 }