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

Timestamp:

Oct 25, 2012 1:09:26 PM (12 years ago)

Author:

vboxsync

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

81640

Message:

Fe/VBoxBallonCtrl: More argv handling.

Location:

trunk/src/VBox/Frontends/VBoxBalloonCtrl

Files:

• VBoxModAPIMonitor.cpp (modified) (2 diffs)
• VBoxModBallooning.cpp (modified) (2 diffs)
• VBoxWatchdog.cpp (modified) (1 diff)
• VBoxWatchdogInternal.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModAPIMonitor.cpp

@@ -389 +389 @@
 }
 
-static DECLCALLBACK(int) VBoxModAPIMonitorOption(int argc, char *argv[])
+static DECLCALLBACK(int) VBoxModAPIMonitorOption(int argc, char *argv[], int *piConsumed)
 {
     if (!argc) /* Take a shortcut. */
         return -1;
 
-    AssertPtrReturn(argv, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(argv, VERR_INVALID_POINTER);
+    AssertPtrReturn(piConsumed, VERR_INVALID_POINTER);
 
     RTGETOPTSTATE GetState;
@@ -441 +442 @@
                 break;
         }
-    }
+
+        /* At the moment we only process one option at a time. */
+        break;
+    }
+
+    *piConsumed += GetState.iNext - 1;
 
     return rc;

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModBallooning.cpp

@@ -346 +346 @@
 }
 
-static DECLCALLBACK(int) VBoxModBallooningOption(int argc, char *argv[])
+static DECLCALLBACK(int) VBoxModBallooningOption(int argc, char *argv[], int *piConsumed)
 {
     if (!argc) /* Take a shortcut. */
         return -1;
 
-    AssertPtrReturn(argv, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(argv, VERR_INVALID_POINTER);
+    AssertPtrReturn(piConsumed, VERR_INVALID_POINTER);
 
     RTGETOPTSTATE GetState;
@@ -400 +401 @@
                 break;
         }
-    }
+
+        /* At the moment we only process one option at a time. */
+        break;
+    }
+
+    *piConsumed += GetState.iNext - 1;
 
     return rc;

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxWatchdog.cpp

@@ -1036 +1036 @@
                     for (unsigned j = 0; !fFound && j < RT_ELEMENTS(g_aModules); j++)
                     {
-                        rc = g_aModules[j].pDesc->pfnOption(1 /* Current value only. */,
-                                                            &argv[GetState.iNext - 1]);
+                        int iArgCnt = argc - GetState.iNext + 1;
+                        int iArgIndex = GetState.iNext - 1;
+                        int iConsumed = 0;
+                        rc = g_aModules[j].pDesc->pfnOption(iArgCnt,
+                                                            &argv[iArgIndex],
+                                                            &iConsumed);
                         fFound = rc == 0;
                         if (fFound)
+                        {
+                            GetState.iNext += iConsumed;
                             break;
+                        }
                         if (rc != -1)
                             return rc;

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxWatchdogInternal.h

@@ -144 +144 @@
      * @param   argc        Argument count.
      * @param   argv        Arguments.
-     */
-    DECLCALLBACKMEMBER(int, pfnOption)(int argc, char *argv[]);
+     * @param   piConsumed  How many parameters this callback consumed from the
+     *                      remaining arguments passed in.
+     */
+    DECLCALLBACKMEMBER(int, pfnOption)(int argc, char *argv[], int *piConsumed);
 
     /**