Changeset 54443 in vbox

Timestamp:

Feb 24, 2015 12:33:57 PM (10 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage/VBoxManageDisk.cpp: fix COM incompatibility (variable name was the same as the COM type)

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (3 diffs)

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

@@ -56 +56 @@
 {
     int rc = VINF_SUCCESS;
-    unsigned MediumVariant = (unsigned)(*pMediumVariant);
+    unsigned uMediumVariant = (unsigned)(*pMediumVariant);
     while (psz && *psz && RT_SUCCESS(rc))
     {
@@ -70 +70 @@
             // variant, whereas the other flags are cumulative.
             if (!RTStrNICmp(psz, "standard", len))
-                MediumVariant = MediumVariant_Standard;
+                uMediumVariant = MediumVariant_Standard;
             else if (   !RTStrNICmp(psz, "fixed", len)
                      || !RTStrNICmp(psz, "static", len))
-                MediumVariant |= MediumVariant_Fixed;
+                uMediumVariant |= MediumVariant_Fixed;
             else if (!RTStrNICmp(psz, "Diff", len))
-                MediumVariant |= MediumVariant_Diff;
+                uMediumVariant |= MediumVariant_Diff;
             else if (!RTStrNICmp(psz, "split2g", len))
-                MediumVariant |= MediumVariant_VmdkSplit2G;
+                uMediumVariant |= MediumVariant_VmdkSplit2G;
             else if (   !RTStrNICmp(psz, "stream", len)
                      || !RTStrNICmp(psz, "streamoptimized", len))
-                MediumVariant |= MediumVariant_VmdkStreamOptimized;
+                uMediumVariant |= MediumVariant_VmdkStreamOptimized;
             else if (!RTStrNICmp(psz, "esx", len))
-                MediumVariant |= MediumVariant_VmdkESX;
+                uMediumVariant |= MediumVariant_VmdkESX;
             else
                 rc = VERR_PARSE_ERROR;
@@ -93 +93 @@
 
     if (RT_SUCCESS(rc))
-        *pMediumVariant = (MediumVariant_T)MediumVariant;
+        *pMediumVariant = (MediumVariant_T)uMediumVariant;
     return rc;
 }