Changeset 72904 in vbox for trunk/include/VBox

Timestamp:

Jul 4, 2018 9:52:10 PM (7 years ago)

Author:

vboxsync

Message:

com::Guid: fix circular logic in isZero()

File:

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

trunk/include/VBox/com/Guid.h

@@ -81 +81 @@
     Guid(const RTUUID &that)
     {
-        mGuidState = GUID_NORMAL;
         mUuid = that;
-        if (isZero())
-            mGuidState = GUID_ZERO;
+        updateState();
         dbg_refresh();
     }
@@ -92 +90 @@
         AssertCompileSize(GUID, sizeof(RTUUID));
         ::memcpy(&mUuid, &that, sizeof(GUID));
-        mGuidState = GUID_NORMAL;
-        if (isZero())
-            mGuidState = GUID_ZERO;
+        updateState();
         dbg_refresh();
     }
@@ -176 +172 @@
     {
         mUuid = guid;
-        mGuidState = GUID_NORMAL;
-        if (isZero())
-            mGuidState = GUID_ZERO;
+        updateState();
         dbg_refresh();
         return *this;
@@ -187 +181 @@
         AssertCompileSize(GUID, sizeof(RTUUID));
         ::memcpy(&mUuid, &guid, sizeof(GUID));
-        mGuidState = GUID_NORMAL;
-        if (isZero())
-            mGuidState = GUID_ZERO;
+        updateState();
         dbg_refresh();
         return *this;
@@ -409 +401 @@
 
 private:
+    void updateState()
+    {
+        if (::RTUuidIsNull(&mUuid))
+            mGuidState = GUID_ZERO;
+        else
+            mGuidState = GUID_NORMAL;
+    }
+
     void initString(const char *that)
     {
@@ -418 +418 @@
         else
         {
-            mGuidState = GUID_NORMAL;
             int rc = ::RTUuidFromStr(&mUuid, that);
             if (RT_FAILURE(rc))
@@ -425 +424 @@
                 mGuidState = GUID_INVALID;
             }
-            else if (isZero())
-                mGuidState = GUID_ZERO;
+            else
+                updateState();
         }
         dbg_refresh();
@@ -440 +439 @@
         else
         {
-            mGuidState = GUID_NORMAL;
             int rc = ::RTUuidFromUtf16(&mUuid, that);
             if (RT_FAILURE(rc))
@@ -447 +445 @@
                 mGuidState = GUID_INVALID;
             }
-            else if (isZero())
-                mGuidState = GUID_ZERO;
+            else
+                updateState();
         }
         dbg_refresh();