Changeset 18777 in vbox for trunk/src/VBox

Timestamp:

Apr 6, 2009 3:33:13 PM (16 years ago)

Author:

vboxsync

Message:

VBoxManage/snapshot: double-dash command line options

File:

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

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

@@ -68 +68 @@
 
         /* switch based on the command */
-        if (strcmp(a->argv[1], "take") == 0)
+        if (!strcmp(a->argv[1], "take"))
         {
             /* there must be a name */
@@ -78 +78 @@
             }
             Bstr name(a->argv[2]);
-            if ((a->argc > 3) && ((a->argc != 5) || (strcmp(a->argv[3], "-desc") != 0)))
+            if ((a->argc > 3) && (   (a->argc != 5)
+                                  || (   strcmp(a->argv[3], "--description")
+                                      && strcmp(a->argv[3], "-description")
+                                      && strcmp(a->argv[3], "-desc"))))
             {
                 errorSyntax(USAGE_SNAPSHOT, "Incorrect description format");
@@ -101 +104 @@
             }
         }
-        else if (strcmp(a->argv[1], "discard") == 0)
+        else if (!strcmp(a->argv[1], "discard"))
         {
             /* exactly one parameter: snapshot name */
@@ -141 +144 @@
             }
         }
-        else if (strcmp(a->argv[1], "discardcurrent") == 0)
+        else if (!strcmp(a->argv[1], "discardcurrent"))
         {
             if (   (a->argc != 3)
-                || (   (strcmp(a->argv[2], "-state") != 0)
-                    && (strcmp(a->argv[2], "-all") != 0)))
+                || (   strcmp(a->argv[2], "--state")
+                    && strcmp(a->argv[2], "-state")
+                    && strcmp(a->argv[2], "--all")
+                    && strcmp(a->argv[2], "-all")))
             {
                 errorSyntax(USAGE_SNAPSHOT, "Invalid parameter '%s'", Utf8Str(a->argv[2]).raw());
@@ -152 +157 @@
             }
             bool fAll = false;
-            if (strcmp(a->argv[2], "-all") == 0)
+            if (   !strcmp(a->argv[2], "--all")
+                || !strcmp(a->argv[2], "-all"))
                 fAll = true;
 
@@ -178 +184 @@
 
         }
-        else if (strcmp(a->argv[1], "edit") == 0)
+        else if (!strcmp(a->argv[1], "edit"))
         {
             if (a->argc < 3)
@@ -189 +195 @@
             ComPtr<ISnapshot> snapshot;
 
-            if (strcmp(a->argv[2], "-current") == 0)
+            if (   !strcmp(a->argv[2], "--current")
+                || !strcmp(a->argv[2], "-current"))
             {
                 CHECK_ERROR_BREAK(machine, COMGETTER(CurrentSnapshot)(snapshot.asOutParam()));
@@ -211 +218 @@
             for (int i = 3; i < a->argc; i++)
             {
-                if (strcmp(a->argv[i], "-newname") == 0)
+                if (   !strcmp(a->argv[i], "--name")
+                    || !strcmp(a->argv[i], "-name")
+                    || !strcmp(a->argv[i], "-newname"))
                 {
                     if (a->argc <= i + 1)
@@ -222 +231 @@
                     snapshot->COMSETTER(Name)(Bstr(a->argv[i]));
                 }
-                else if (strcmp(a->argv[i], "-newdesc") == 0)
+                else if (   !strcmp(a->argv[i], "--description")
+                         || !strcmp(a->argv[i], "-description")
+                         || !strcmp(a->argv[i], "-newdesc"))
                 {
                     if (a->argc <= i + 1)
@@ -242 +253 @@
 
         }
-        else if (strcmp(a->argv[1], "showvminfo") == 0)
+        else if (!strcmp(a->argv[1], "showvminfo"))
         {
             /* exactly one parameter: snapshot name */