Changeset 30125 in vbox for trunk

Timestamp:

Jun 9, 2010 2:45:10 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManage: fixed storageattach error handling

File:

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

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

@@ -148 +148 @@
         }
     }
-
-    if (   FAILED(rc)
-        || !pszCtl
-        || port == ~0U
-        || device == ~0U)
-    {
-        errorGetOpt(USAGE_STORAGEATTACH, c, &ValueUnion);
+    
+    if (FAILED(rc))
         return 1;
-    }
+
+    if (!pszCtl)
+        return errorSyntax(USAGE_STORAGEATTACH, "Storage controller name not specified");
+    if (port == ~0U)
+        return errorSyntax(USAGE_STORAGEATTACH, "Port not specified");
+    if (device == ~0U)
+        return errorSyntax(USAGE_STORAGEATTACH, "Device not specified");
 
     /* get the virtualbox system properties */
@@ -769 +770 @@
         /* it's important to always close sessions */
         a->session->Close();
-        errorSyntax(USAGE_STORAGECONTROLLER, "Storage Controller Name not specified\n");
+        errorSyntax(USAGE_STORAGECONTROLLER, "Storage controller name not specified\n");
         return 1;
     }