Changeset 9994 in vbox

Timestamp:

Jun 27, 2008 1:16:26 PM (17 years ago)

Author:

vboxsync

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

32445

Message:

Additions/common: clean up mode reading code in VBoxGuestR3LibVideo.cpp

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

@@ -294 +294 @@
         /* Extract the width from the string */
         rc = RTStrToUInt32Ex(szModeParms, &pszNext, 10, &cx);
-    if (   (VWRN_NUMBER_TOO_BIG == rc)
-        || (VWRN_NEGATIVE_UNSIGNED == rc)
-        || (RT_SUCCESS(rc) && (*pszNext != ',') && (*pszNext != 'x')))
+    if ((rc != VWRN_TRAILING_CHARS) || (*pszNext != 'x'))
         rc = VERR_INVALID_PARAMETER;
     if (RT_SUCCESS(rc))
     {
-        if ((*pszNext != ',') || (*pszNext != 'x'))
-            ++pszNext;
-        for (;' ' == *pszNext; ++pszNext);
+        ++pszNext;
         rc = RTStrToUInt32Ex(pszNext, &pszNext, 10, &cy);
     }
-    if (   (VWRN_NUMBER_TOO_BIG == rc)
-        || (VWRN_NEGATIVE_UNSIGNED == rc)
-        || (RT_SUCCESS(rc) && (*pszNext != ',') && (*pszNext != 'x')))
+    if ((rc != VWRN_TRAILING_CHARS) || (*pszNext != 'x'))
         rc = VERR_INVALID_PARAMETER;
     if (RT_SUCCESS(rc))
     {
-        if ((*pszNext != ',') || (*pszNext != 'x'))
-            ++pszNext;
-        for (;' ' == *pszNext; ++pszNext);
-        rc = RTStrToUInt32Ex(pszNext, &pszNext, 10, &cBits);
-    }
-    if (   (VWRN_NUMBER_TOO_BIG == rc)
-        || (VWRN_NEGATIVE_UNSIGNED == rc)
-        || (VWRN_TRAILING_CHARS == rc))
+        ++pszNext;
+        rc = RTStrToUInt32Full(pszNext, 10, &cBits);
+    }
+    if (rc != VINF_SUCCESS)
         rc = VERR_INVALID_PARAMETER;
     if (u32ClientId != 0)