Changeset 44039 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 5, 2012 12:08:52 PM (12 years ago)

Author:

vboxsync

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

82492

Message:

Main: renavation com::Guid class. PR5744

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageControlVM.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageDisk.cpp (modified) (1 diff)
• VBoxSDL/VBoxSDL.cpp (modified) (3 diffs)

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

@@ -874 +874 @@
 
             Bstr usbId = a->argv[2];
-            if (Guid(usbId).isEmpty())
+
+            Guid guid(usbId);
+            if (!guid.isValid())
             {
                 // assume address
@@ -897 +899 @@
                     CHECK_ERROR_BREAK(dev, COMGETTER(Id)(usbId.asOutParam()));
                 }
+            }
+            else if (guid.isZero())
+            {
+                errorArgument("Zero UUID argument '%s'", a->argv[2]);
+                rc = E_FAIL;
+                break;
             }
 

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

@@ -159 +159 @@
 
     /* If it is no UUID, convert the filename to an absolute one. */
-    if (id.isEmpty())
+    if (!id.isValid())
     {
         int irc = RTPathAbs(pszFilenameOrUuid, szFilenameAbs, sizeof(szFilenameAbs));

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -950 +950 @@
             // first check if a UUID was supplied
             uuidVM = argv[curArg];
-            if (uuidVM.isEmpty())
+
+            if (!uuidVM.isValid())
             {
                 LogFlow(("invalid UUID format, assuming it's a VM name\n"));
                 vmName = argv[curArg];
+            }
+            else if (uuidVM.isZero())
+            {
+                RTPrintf("Error: UUID argument is zero!\n");
+                return 1;
             }
         }
@@ -1417 +1423 @@
      * Do we have a UUID?
      */
-    if (!uuidVM.isEmpty())
+    if (uuidVM.isValid())
     {
         rc = pVirtualBox->FindMachine(uuidVM.toUtf16().raw(), pMachine.asOutParam());
@@ -1443 +1449 @@
             goto leave;
         }
-    }
-    else if (uuidVM.isEmpty())
-    {
-        RTPrintf("Error: no machine specified!\n");
-        goto leave;
     }