Changeset 51655 in vbox

Timestamp:

Jun 18, 2014 8:36:51 PM (11 years ago)

Author:

vboxsync

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

94419

Message:

crOpenGL: move parse int tooling to util

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_string.h (modified) (2 diffs)
• GuestHost/OpenGL/util/string.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_config.c (modified) (5 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_string.h

@@ -9 +9 @@
 
 #include <iprt/cdefs.h>
+#include <iprt/types.h>
 
 RT_C_DECLS_BEGIN
@@ -61 +62 @@
 
 DECLEXPORT(int) crStrParseGlVersion(const char * ver);
+DECLEXPORT(int32_t) crStrParseI32(const char *pszStr, const int32_t defaultVal);
 RT_C_DECLS_END
 

trunk/src/VBox/GuestHost/OpenGL/util/string.c

@@ -532 +532 @@
     return iVer;
 }
+
+int32_t crStrParseI32(const char *pszStr, const int32_t defaultVal)
+{
+    int32_t result = 0;
+    bool neg = false;
+    unsigned char iDigit = 0;
+    if (!pszStr || pszStr[0] == '\0')
+        return defaultVal;
+
+    for (;;)
+    {
+        if (pszStr[0] == '\0')
+            return defaultVal;
+
+        if (pszStr[0] == ' ' || pszStr[0] == '\t' || pszStr[0] == '\n')
+        {
+            ++pszStr;
+            continue;
+        }
+
+        if (pszStr[0] == '-')
+        {
+            if (neg)
+                return defaultVal;
+
+            neg = true;
+            ++pszStr;
+            continue;
+        }
+
+        break;
+    }
+
+    for (;;)
+    {
+        unsigned char digit;
+        if (pszStr[0] == '\0')
+        {
+            if (!iDigit)
+                return defaultVal;
+            break;
+        }
+
+        digit = pszStr[0] - '0';
+        if (digit > 9)
+            return defaultVal;
+
+        result *= 10;
+        result += digit;
+        ++iDigit;
+
+        ++pszStr;
+    }
+
+    return !neg ? result : -result;
+}

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -371 +371 @@
 
 void crServerInitTmpCtxDispatch();
-
-int crServerVBoxParseNumerics(const char *pszStr, const int defaultVal);
 
 typedef struct CR_FBMAP

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c

@@ -56 +56 @@
 
     cr_server.pfnNotifyEventCB = NULL;
-}
-
-int crServerVBoxParseNumerics(const char *pszStr, const int defaultVal)
-{
-    int result = 0;
-    bool neg = false;
-    unsigned char iDigit = 0;
-    if (!pszStr || pszStr[0] == '\0')
-        return defaultVal;
-
-    for (;;)
-    {
-        if (pszStr[0] == '\0')
-            return defaultVal;
-
-        if (pszStr[0] == ' ' || pszStr[0] == '\t' || pszStr[0] == '\n')
-        {
-            ++pszStr;
-            continue;
-        }
-
-        if (pszStr[0] == '-')
-        {
-            if (neg)
-                return defaultVal;
-
-            neg = true;
-            ++pszStr;
-            continue;
-        }
-
-        break;
-    }
-
-    for (;;)
-    {
-        unsigned char digit;
-        if (pszStr[0] == '\0')
-        {
-            if (!iDigit)
-                return defaultVal;
-            break;
-        }
-
-        digit = pszStr[0] - '0';
-        if (digit > 9)
-            return defaultVal;
-
-        result *= 10;
-        result += digit;
-        ++iDigit;
-
-        ++pszStr;
-    }
-
-    return !neg ? result : -result;
 }
 
@@ -213 +157 @@
     if (env != NULL && env[0] != '\0')
     {
-        unsigned int bits = (unsigned int)crServerVBoxParseNumerics(env, 0);
+        unsigned int bits = (unsigned int)crStrParseI32(env, 0);
         if (bits <= CR_ALL_BITS)
             cr_server.fVisualBitsDefault = bits;
@@ -225 +169 @@
     if (env && env[0] != '\0')
     {
-        cr_server.u32Caps = crServerVBoxParseNumerics(env, 0);
+        cr_server.u32Caps = crStrParseI32(env, 0);
         cr_server.u32Caps &= CR_VBOX_CAPS_ALL;
     }
@@ -363 +307 @@
     if (env != NULL && env[0] != '\0')
     {
-        unsigned int bits = (unsigned int)crServerVBoxParseNumerics(env, 0);
+        unsigned int bits = (unsigned int)crStrParseI32(env, 0);
         if (bits <= CR_ALL_BITS)
             cr_server.fVisualBitsDefault = bits;
@@ -375 +319 @@
     if (env && env[0] != '\0')
     {
-        cr_server.u32Caps = crServerVBoxParseNumerics(env, 0);
+        cr_server.u32Caps = crStrParseI32(env, 0);
         cr_server.u32Caps &= CR_VBOX_CAPS_ALL;
     }