Changeset 33313 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Oct 21, 2010 2:56:22 PM (14 years ago)

Author:

vboxsync

Message:

VBoxHeadless: unbreak --startvm UUID (yesterday's regresssion)

File:

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

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -548 +548 @@
               "(C) 2008-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
               "All rights reserved.\n\n");
-
-    Bstr id;
-    /* the below cannot be Bstr because on Linux Bstr doesn't work until XPCOM (nsMemory) is initialized */
-    const char *name = NULL;
 
 #ifdef VBOX_FFMPEG
@@ -616 +612 @@
     };
 
+    const char *pcszNameOrUUID = NULL;
+
     // parse the command line
     int ch;
@@ -626 +624 @@
         {
             case 's':
-                id = asGuidStr(ValueUnion.psz);
-                /* If the argument was not a UUID, then it must be a name. */
-                if (id.isEmpty())
-                    name = ValueUnion.psz;
+                pcszNameOrUUID = ValueUnion.psz;
                 break;
 #ifdef VBOX_WITH_VRDP
@@ -746 +741 @@
 #endif /* defined VBOX_FFMPEG */
 
-    if (id.isEmpty() && !name)
+    if (!pcszNameOrUUID)
     {
         show_usage();
@@ -793 +788 @@
         ComPtr<IMachine> m;
 
-        rc = virtualBox->FindMachine(Bstr(name).raw(), m.asOutParam());
+        rc = virtualBox->FindMachine(Bstr(pcszNameOrUUID).raw(), m.asOutParam());
         if (FAILED(rc))
         {
@@ -799 +794 @@
             break;
         }
+        Bstr id;
         m->COMGETTER(Id)(id.asOutParam());
         AssertComRC(rc);