Changeset 23935 in vbox

Timestamp:

Oct 21, 2009 2:18:11 PM (15 years ago)

Author:

vboxsync

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

53747

Message:

VBoxManage: don't use machine uuid variable for other purposes.

File:

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

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

@@ -572 +572 @@
     /* try to find the given machine */
     ComPtr <IMachine> machine;
-    Bstr uuid (a->argv[0]);
-    if (!Guid(uuid).isEmpty())
-    {
-        CHECK_ERROR(a->virtualBox, GetMachine(uuid, machine.asOutParam()));
+    Bstr machineuuid (a->argv[0]);
+    if (!Guid(machineuuid).isEmpty())
+    {
+        CHECK_ERROR(a->virtualBox, GetMachine(machineuuid, machine.asOutParam()));
     }
     else
     {
-        CHECK_ERROR(a->virtualBox, FindMachine(uuid, machine.asOutParam()));
+        CHECK_ERROR(a->virtualBox, FindMachine(machineuuid, machine.asOutParam()));
         if (SUCCEEDED (rc))
-            machine->COMGETTER(Id)(uuid.asOutParam());
+            machine->COMGETTER(Id)(machineuuid.asOutParam());
     }
     if (FAILED (rc))
@@ -587 +587 @@
 
     /* open a session for the VM */
-    CHECK_ERROR_RET(a->virtualBox, OpenExistingSession(a->session, uuid), 1);
+    CHECK_ERROR_RET(a->virtualBox, OpenExistingSession(a->session, machineuuid), 1);
 
     do
@@ -1121 +1121 @@
         else if (!strcmp(a->argv[1], "dvdattach"))
         {
+            Bstr uuid;
             if (a->argc != 3)
             {
@@ -1153 +1154 @@
             {
                 /* first assume it's a UUID */
-                Bstr uuid(a->argv[2]);
+                uuid = a->argv[2];
                 rc = a->virtualBox->GetDVDImage(uuid, dvdMedium.asOutParam());
                 if (FAILED(rc) || !dvdMedium)
@@ -1184 +1185 @@
         else if (!strcmp(a->argv[1], "floppyattach"))
         {
+            Bstr uuid;
             if (a->argc != 3)
             {
@@ -1215 +1217 @@
             {
                 /* first assume it's a UUID */
-                Bstr uuid(a->argv[2]);
+                uuid = a->argv[2];
                 rc = a->virtualBox->GetFloppyImage(uuid, floppyMedium.asOutParam());
                 if (FAILED(rc) || !floppyMedium)