Changeset 26517 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/VMM/testcase

Files:

• tstCompressionBenchmark.cpp (modified) (3 diffs)
• tstVMM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp

@@ -26 +26 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#include <iprt/buildconfig.h>
 #include <iprt/crc.h>
 #include <iprt/ctype.h>
@@ -248 +249 @@
         { "--page-file",      'f', RTGETOPT_REQ_STRING },
         { "--offset",         'o', RTGETOPT_REQ_UINT64 },
-        { "--help",           'h', RTGETOPT_REQ_NOTHING },
     };
 
@@ -315 +315 @@
                 return 0;
 
+            case 'V':
+                RTPrintf("%sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr());
+                return 0;
+
             default:
-                if (rc == VINF_GETOPT_NOT_OPTION)
-                    Error("unknown argument: %s\n", Val.psz);
-                else if (rc > 0)
-                {
-                    if (RT_C_IS_GRAPH(rc))
-                        Error("unhandled option: -%c\n", rc);
-                    else
-                        Error("unhandled option: %d\n", rc);
-                }
-                else if (rc == VERR_GETOPT_UNKNOWN_OPTION)
-                    Error("unknown option: %s\n", Val.psz);
-                else if (Val.pDef)
-                    Error("%s: %Rrs\n", Val.pDef->pszLong, rc);
-                else
-                    Error("%Rrs\n", rc);
-                return 1;
+                return RTGetOptPrintError(rc, &Val);
         }
     }

trunk/src/VBox/VMM/testcase/tstVMM.cpp

@@ -205 +205 @@
         { "--cpus",          'c', RTGETOPT_REQ_UINT8 },
         { "--test",          't', RTGETOPT_REQ_STRING },
-        { "--help",          'h', 0 },
     };
     enum
@@ -241 +240 @@
                 return 1;
 
-            case VINF_GETOPT_NOT_OPTION:
-                RTPrintf("tstVMM: syntax error: non option '%s'\n", ValueUnion.psz);
-                break;
+            case 'V':
+                RTPrintf("$Revision: $\n");
+                return 0;
 
             default:
-                if (ch > 0)
-                {
-                    if (RT_C_IS_GRAPH(ch))
-                        RTPrintf("tstVMM: unhandled option: -%c\n", ch);
-                    else
-                        RTPrintf("tstVMM: unhandled option: %i\n", ch);
-                }
-                else if (ch == VERR_GETOPT_UNKNOWN_OPTION)
-                    RTPrintf("tstVMM: unknown option: %s\n", ValueUnion.psz);
-                else if (ValueUnion.pDef)
-                    RTPrintf("tstVMM: %s: %Rrs\n", ValueUnion.pDef->pszLong, ch);
-                else
-                    RTPrintf("tstVMM: %Rrs\n", ch);
-                return 1;
+                return RTGetOptPrintError(ch, &ValueUnion);
         }
     }