Changeset 17091 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 24, 2009 7:55:23 PM (16 years ago)

Author:

vboxsync

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

43321

Message:

RTGetOpt interface changes.

Location:

trunk/src/VBox/Devices/Network/testcase

Files:

• tstIntNet-1.cpp (modified) (4 diffs)
• tstIntNetR0.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp

@@ -670 +670 @@
     RTR3Init();
 
-    static RTOPTIONDEF const s_aOptions[] =
+    static RTGETOPTDEF const s_aOptions[] =
     {
         { "--duration",     'd', RTGETOPT_REQ_UINT32 },
@@ -717 +717 @@
     int ch;
     int iArg = 1;
-    RTOPTIONUNION Value;
-    while ((ch = RTGetOpt(argc,argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), &iArg, &Value)))
+    RTGETOPTUNION Value;
+    RTGETOPTSTATE GetState;
+    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0 /* fFlags */);
+    while ((ch = RTGetOpt(&GetState, &Value)))
         switch (ch)
         {
@@ -807 +809 @@
                 RTPrintf("syntax: tstIntNet-1 [-pStx-] [-d <secs>] [-f <file>] [-r <size>] [-s <size>]\n");
                 return 1;
+            case VINF_GETOPT_NOT_OPTION:
+                RTPrintf("tstIntNetR0: invalid argument: %s\n", Value.psz);
+                return 1;
 
             default:
@@ -817 +822 @@
                 return 1;
         }
-    if (iArg < argc)
-    {
-        RTPrintf("tstIntNetR0: invalid argument: %s\n", argv[iArg]);
-        return 1;
-    }
-
 
     RTPrintf("tstIntNet-1: TESTING...\n");

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp

@@ -400 +400 @@
     RTR3Init();
 
-    static RTOPTIONDEF const s_aOptions[] =
+    static RTGETOPTDEF const s_aOptions[] =
     {
         { "--recv-buffer",  'r', RTGETOPT_REQ_UINT32 },
@@ -410 +410 @@
 
     int ch;
-    int iArg = 1;
-    RTOPTIONUNION Value;
-    while ((ch = RTGetOpt(argc,argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), &iArg, &Value)))
+    RTGETOPTUNION Value;
+    RTGETOPTSTATE GetState;
+    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0 /* fFlags */);
+    while ((ch = RTGetOpt(&GetState, &Value)))
         switch (ch)
         {
@@ -423 +424 @@
                 break;
 
+            case VINF_GETOPT_NOT_OPTION:
+                RTPrintf("tstIntNetR0: invalid argument: %s\n", Value.psz);
+                return 1;
+
             default:
                 RTPrintf("tstIntNetR0: invalid argument: %s\n", Value.psz);
                 return 1;
         }
-    if (iArg < argc)
-    {
-        RTPrintf("tstIntNetR0: invalid argument: %s\n", argv[iArg]);
-        return 1;
-    }
 
     /*