Changeset 26517 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Feb 14, 2010 9:39:00 PM (15 years ago)

Author:

vboxsync

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

57688

Message:

*: RTGetOpt cleanup related to --help and --version (now standard option). Use RTGetOptPrintError.

Location:

trunk/src/VBox/Devices/Network/testcase

Files:

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

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

@@ -684 +684 @@
         { "--xmit-test",    'x', RTGETOPT_REQ_NOTHING },
         { "--ping-test",    'P', RTGETOPT_REQ_NOTHING },
-        { "--help",         'h', RTGETOPT_REQ_NOTHING },
-        { "--?",            '?', RTGETOPT_REQ_NOTHING },
     };
 
@@ -805 +803 @@
                 break;
 
-            case '?':
             case 'h':
                 RTPrintf("syntax: tstIntNet-1 <options>\n"
@@ -818 +815 @@
                 return 1;
 
-            case VINF_GETOPT_NOT_OPTION:
-                RTPrintf("tstIntNetR0: invalid argument: %s\n", Value.psz);
-                return 1;
+            case 'V':
+                RTPrintf("$Revision$\n");
+                return 0;
 
             default:
-                if (RT_SUCCESS(ch))
-                    RTPrintf("tstIntNetR0: invalid argument (%#x): %s\n", ch, Value.psz);
-                else if (Value.pDef)
-                    RTPrintf("tstIntNetR0: invalid argument: %Rrc - %s\n", ch, Value.pDef->pszLong);
-                else
-                    RTPrintf("tstIntNetR0: invalid argument: %Rrc - %s\n", ch, argv[iArg]);
-                return 1;
+                return RTGetOptPrintError(ch, &Value);
         }
 

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

@@ -412 +412 @@
     RTGETOPTUNION Value;
     RTGETOPTSTATE GetState;
-    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0 /* fFlags */);
+    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, RTGETOPTINIT_FLAGS_NO_STD_OPTS);
     while ((ch = RTGetOpt(&GetState, &Value)))
         switch (ch)
@@ -424 +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;
+                return RTGetOptPrintError(ch, &Value);
         }