Changeset 32979 in vbox

Timestamp:

Oct 7, 2010 2:16:52 PM (14 years ago)

Author:

vboxsync

Message:

iprt: RTUuidFromStr() / RTUuidFromUtf16(): allow the format with braces as well

File:

• trunk/src/VBox/Runtime/generic/uuid-generic.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/generic/uuid-generic.cpp

@@ -255 +255 @@
     AssertPtrReturn(pszString, VERR_INVALID_PARAMETER);
 
+    bool fHaveBraces = (pszString[0] == '{' && pszString[37] == '}');
+    if (fHaveBraces)
+        pszString++;
+
 #define MY_CHECK(expr) do { if (RT_UNLIKELY(!(expr))) return VERR_INVALID_UUID_FORMAT; } while (0)
 #define MY_ISXDIGIT(ch) (g_au8Digits[(ch) & 0xff] != 0xff)
@@ -293 +297 @@
     MY_CHECK(MY_ISXDIGIT(pszString[34]));
     MY_CHECK(MY_ISXDIGIT(pszString[35]));
-    MY_CHECK(!pszString[36]);
+    MY_CHECK(!pszString[36 + (fHaveBraces ? 1 : 0)]);
 #undef MY_ISXDIGIT
 #undef MY_CHECK
@@ -421 +425 @@
     AssertPtrReturn(pwszString, VERR_INVALID_PARAMETER);
 
+    bool fHaveBraces = (pwszString[0] == '{' && pwszString[37] == '}');
+    if (fHaveBraces)
+        pwszString++;
+
 #define MY_CHECK(expr) do { if (RT_UNLIKELY(!(expr))) return VERR_INVALID_UUID_FORMAT; } while (0)
 #define MY_ISXDIGIT(ch) (!((ch) & 0xff00) && g_au8Digits[(ch) & 0xff] != 0xff)
@@ -459 +467 @@
     MY_CHECK(MY_ISXDIGIT(pwszString[34]));
     MY_CHECK(MY_ISXDIGIT(pwszString[35]));
-    MY_CHECK(!pwszString[36]);
+    MY_CHECK(!pwszString[36 + (fHaveBraces ? 1 : 0)]);
 #undef MY_ISXDIGIT
 #undef MY_CHECK