Changeset 72976 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jul 8, 2018 1:58:59 PM (7 years ago)

Author:

vboxsync

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

123528

Message:

VBoxManage: XPCOM/C++ enum exorcism. Found a enum type mismatch in handleCloneMedium and fixed it as best I could.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageAppliance.cpp (modified) (1 diff)
• VBoxManageDisk.cpp (modified) (4 diffs)
• VBoxManageInfo.cpp (modified) (2 diffs)
• VBoxManageList.cpp (modified) (4 diffs)

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

@@ -914 +914 @@
                             break;
                         case VirtualSystemDescriptionType_Ignore:
+#ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK
+                        case VirtualSystemDescriptionType_32BitHack:
+#endif
                             break;
                     }

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

@@ -911 +911 @@
     if (!pszDst)
         return errorSyntax(USAGE_CLONEMEDIUM, "Mandatory output file parameter missing");
-    if (fExisting && (!format.isEmpty() || enmMediumVariant != MediumType_Normal))
+    if (fExisting && (!format.isEmpty() || enmMediumVariant != MediumVariant_Standard))
         return errorSyntax(USAGE_CLONEMEDIUM, "Specified options which cannot be used with --existing");
 
@@ -1237 +1237 @@
                 pszState = "deleting";
                 break;
+#ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK
+            case MediumState_32BitHack: break; /* Shut up compiler warnings. */
+#endif
         }
         RTPrintf("State:          %s\n", pszState);
@@ -1281 +1284 @@
                 typeStr = "multiattach";
                 break;
+#ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK
+            case MediumType_32BitHack: break; /* Shut up compiler warnings. */
+#endif
         }
         RTPrintf("Type:           %s\n", typeStr);
@@ -2025 +2031 @@
      * Make sure a medium was specified already.
      */
-    if (pCommonOpts->enmDeviceType == MEDIUMCATEGORY_NONE)
+    if (pCommonOpts->enmDeviceType == DeviceType_Null)
         return errorSyntax("No medium specified!");
 

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

@@ -271 +271 @@
  * @param   enmType         Bandwidth control group type.
  */
-inline const char * bwGroupTypeToString(BandwidthGroupType_T enmType)
+static const char * bwGroupTypeToString(BandwidthGroupType_T enmType)
 {
     switch (enmType)
@@ -278 +278 @@
         case BandwidthGroupType_Disk:    return "Disk";
         case BandwidthGroupType_Network: return "Network";
+#ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK
+        case BandwidthGroupType_32BitHack: break; /* Shut up compiler warnings. */
+#endif
     }
     return "unknown";

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

@@ -53 +53 @@
         case HostNetworkInterfaceMediumType_SLIP: return "SLIP";
         case HostNetworkInterfaceMediumType_Unknown: return "Unknown";
+#ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK
+        case HostNetworkInterfaceMediumType_32BitHack: break; /* Shut up compiler warnings. */
+#endif
     }
     return "unknown";
@@ -64 +67 @@
         case HostNetworkInterfaceStatus_Down: return "Down";
         case HostNetworkInterfaceStatus_Unknown: return "Unknown";
+#ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK
+        case HostNetworkInterfaceStatus_32BitHack: break; /* Shut up compiler warnings. */
+#endif
     }
     return "unknown";
@@ -82 +88 @@
         case DeviceType_SharedFolder:   return "SharedFolder";
         case DeviceType_Graphics3D:     return "Graphics3D";
+#ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK
+        case DeviceType_32BitHack: break; /* Shut up compiler warnings. */
+#endif
     }
     return "Unknown";
@@ -381 +390 @@
                     case DataType_Int8: RTPrintf("byte"); break;
                     case DataType_String: RTPrintf("string"); break;
+#ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK
+                    case DataType_32BitHack: break; /* Shut up compiler warnings. */
+#endif
                 }
                 RTPrintf(" flags=%#04x", propertyFlags[j]);