Changeset 72894 in vbox for trunk/include/VBox

Timestamp:

Jul 4, 2018 5:01:01 PM (7 years ago)

Author:

vboxsync

Message:

com::Guid: use initString/initBSTR in the corresponding operator=
instead of duplicating the code.

File:

• trunk/include/VBox/com/Guid.h (modified) (2 diffs)

trunk/include/VBox/com/Guid.h

@@ -196 +196 @@
     Guid& operator=(const char *str)
     {
-        if (!str || !*str)
-        {
-            ::RTUuidClear(&mUuid);
-            mGuidState = GUID_ZERO;
-        }
-        else
-        {
-            mGuidState = GUID_NORMAL;
-            int rc = ::RTUuidFromStr(&mUuid, str);
-            if (RT_FAILURE(rc))
-            {
-                ::RTUuidClear(&mUuid);
-                mGuidState = GUID_INVALID;
-            }
-            else if (isZero())
-                mGuidState = GUID_ZERO;
-        }
-        dbg_refresh();
+        initString(str);
         return *this;
     }
@@ -219 +202 @@
     Guid& operator=(CBSTR str)
     {
-        if (!str || !*str)
-        {
-            ::RTUuidClear(&mUuid);
-            mGuidState = GUID_ZERO;
-        }
-        else
-        {
-            mGuidState = GUID_NORMAL;
-            int rc = ::RTUuidFromUtf16(&mUuid, str);
-            if (RT_FAILURE(rc))
-            {
-                ::RTUuidClear(&mUuid);
-                mGuidState = GUID_INVALID;
-            }
-            else if (isZero())
-                mGuidState = GUID_ZERO;
-        }
-        dbg_refresh();
+        initBSTR(str);
         return *this;
     }