Changeset 41237 in vbox for trunk

Timestamp:

May 10, 2012 1:56:27 PM (13 years ago)

Author:

vboxsync

Message:

Small { formatting change for 6130

File:

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

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

@@ -171 +171 @@
 
     if (!fSilent)
-        CHECK_ERROR(a->virtualBox, OpenMedium(Bstr(pszFilenameOrUuid).raw(),
-                                              enmDevType, AccessMode_ReadWrite,
-                                              /* fForceNewUuidOnOpen */ false,
-                                              pMedium.asOutParam()));
+        CHECK_ERROR(a->virtualBox, FindMedium(Bstr(pszFilenameOrUuid).raw(),
+                                              enmDevType, pMedium.asOutParam()));
     else
-        rc = a->virtualBox->OpenMedium(Bstr(pszFilenameOrUuid).raw(),
-                                              enmDevType, AccessMode_ReadWrite,
-                                              /* fForceNewUuidOnOpen */ false,
-                                              pMedium.asOutParam());
+        rc = a->virtualBox->FindMedium(Bstr(pszFilenameOrUuid).raw(),
+                                       enmDevType, pMedium.asOutParam());
     return rc;
 }
@@ -204 +200 @@
     }
 
-    rc = a->virtualBox->OpenMedium(Bstr(pszFilenameOrUuid).raw(),
-                                   enmDevType, AccessMode_ReadWrite,
-                                   /* fForceNewUuidOnOpen */ false,
+    rc = a->virtualBox->FindMedium(Bstr(pszFilenameOrUuid).raw(), enmDevType,
                                    pMedium.asOutParam());
     /* If the medium is unknown try to open it. */
@@ -238 +232 @@
             return E_FAIL;
         }
-        pszFilename = szFilenameAbs; 
-        CHECK_ERROR(a->virtualBox, OpenMedium(Bstr(pszFilename).raw(),
-                                   DeviceType_Network, 
-                                   AccessMode_ReadWrite,
-                                   /* fForceNewUuidOnOpen */ false,
-                                   pMedium.asOutParam()));
-    }else{
-
-        CHECK_ERROR(a->virtualBox, CreateHardDisk(Bstr(pszFormat).raw(),
-                                                  Bstr(pszFilename).raw(),
-                                                  pMedium.asOutParam()));
-    }
+        pszFilename = szFilenameAbs;
+    }
+
+    CHECK_ERROR(a->virtualBox, CreateHardDisk(Bstr(pszFormat).raw(),
+                                              Bstr(pszFilename).raw(),
+                                              pMedium.asOutParam()));
     return rc;
 }
@@ -509 +497 @@
                     FilenameOrUuid = ValueUnion.psz;
                 else
-                    return errorSyntax(USAGE_MODIFYHD, "Invalid parameter '%s'", ValueUnion.psz);
+                    return errorSyntax(USAGE_CREATEHD, "Invalid parameter '%s'", ValueUnion.psz);
                 break;