Changeset 85221 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 11, 2020 4:13:15 PM (4 years ago)

Author:

vboxsync

Message:

vd.h,VBoxInternalManager.cpp: It is certifiably insane to use 3 letter value names for a C enum like VDISKPARTTYPE. Clang 11 complains that it clashes with the MBR and EPT types in the Main API when vd.h is included together with it. bugref:9790

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -124 +124 @@
 {
     /** partitioning type - MBR or GPT */
-    VDISKPARTTYPE uPartitioningType;
+    VDISKPARTTYPE   uPartitioningType;
     unsigned        cPartitions;
     HOSTPARTITION   aPartitions[HOSTPARTITION_MAX];
@@ -759 +759 @@
     if (aBuffer[450] == 0xEE)/* check the sign of the GPT disk*/
     {
-        partitioningType = GPT;
-        pPart->uPartitioningType = GPT;//partitioningType;
+        partitioningType = VDISKPARTTYPE_GPT;
+        pPart->uPartitioningType = VDISKPARTTYPE_GPT;//partitioningType;
 
         if (aBuffer[510] != 0x55 || aBuffer[511] != 0xaa)
@@ -875 +875 @@
     else
     {
-        partitioningType = MBR;
-        pPart->uPartitioningType = MBR;//partitioningType;
+        partitioningType = VDISKPARTTYPE_MBR;
+        pPart->uPartitioningType = VDISKPARTTYPE_MBR;//partitioningType;
 
         if (aBuffer[510] != 0x55 || aBuffer[511] != 0xaa)
@@ -1035 +1035 @@
 
     /* Fill out partitioning location info for backup GPT. */
-    if (partitioningType == GPT)
+    if (partitioningType == VDISKPARTTYPE_GPT)
     {
         pPart->aPartitions[pPart->cPartitions-1].uPartDataStart = lastUsableLBA+1;
@@ -1775 +1775 @@
                 if (!RawDescriptor.pPartDescs[i].cbData)
                 {
-                    if (RawDescriptor.uPartitioningType == MBR)
+                    if (RawDescriptor.uPartitioningType == VDISKPARTTYPE_MBR)
                     {
                         RTMsgError("MBR/EPT overlaps with data area");
@@ -1781 +1781 @@
                         goto out;
                     }
-                    else
+                    if (RawDescriptor.cPartDescs != i+1)
                     {
-                        if (RawDescriptor.cPartDescs != i+1)
-                        {
-                            RTMsgError("GPT overlaps with data area");
-                            vrc = VERR_INVALID_PARAMETER;
-                            goto out;
-                        }
+                        RTMsgError("GPT overlaps with data area");
+                        vrc = VERR_INVALID_PARAMETER;
+                        goto out;
                     }
                 }