Changeset 90087 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Jul 8, 2021 9:14:15 AM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Unified (and fixed some of the) RTGetOpt return values when printing errors. bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (7 diffs)
• vkatCmdGeneric.cpp (modified) (7 diffs)

trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

@@ -804 +804 @@
                 rc = AudioTestSvcHandleOption(&TstEnv.u.Guest.Srv, ch, &ValueUnion);
                 if (RT_FAILURE(rc))
-                    return RTGetOptPrintError(rc, &ValueUnion);
+                    return RTGetOptPrintError(ch, &ValueUnion);
         }
     }
@@ -1001 +1001 @@
     unsigned    iTestSet    = 0;
 
-    int           rc;
+    int           ch;
     RTGETOPTUNION ValueUnion;
-    while ((rc = RTGetOpt(pGetState, &ValueUnion)))
-    {
-        switch (rc)
+    while ((ch = RTGetOpt(pGetState, &ValueUnion)))
+    {
+        switch (ch)
         {
             case VKAT_VERIFY_OPT_TAG:
@@ -1021 +1021 @@
 
             default:
-                return RTGetOptPrintError(rc, &ValueUnion);
+                return RTGetOptPrintError(ch, &ValueUnion);
         }
     }
@@ -1027 +1027 @@
     if (!iTestSet)
         return RTMsgErrorExitFailure("At least one test set must be specified");
+
+    int rc = VINF_SUCCESS;
 
     /*
@@ -1223 +1225 @@
     AssertRCReturn(rc, RTEXITCODE_INIT);
 
+    int           ch;
     RTGETOPTUNION ValueUnion;
-    while ((rc = RTGetOpt(&GetState, &ValueUnion)) != 0)
-    {
-        switch (rc)
+    while ((ch = RTGetOpt(&GetState, &ValueUnion)) != 0)
+    {
+        switch (ch)
         {
             AUDIO_TEST_COMMON_OPTION_CASES(ValueUnion);
@@ -1265 +1268 @@
                             if (RT_SUCCESS(rc))
                             {
-
                                 rcExit = pCmd->pfnHandler(&GetState);
                                 RTMemFree(paCombinedOptions);
@@ -1281 +1283 @@
 
             default:
-                return RTGetOptPrintError(rc, &ValueUnion);
+                return RTGetOptPrintError(ch, &ValueUnion);
         }
     }

trunk/src/VBox/ValidationKit/utils/audio/vkatCmdGeneric.cpp

@@ -75 +75 @@
 
     /* Argument processing loop: */
-    int           rc;
+    int           ch;
     RTGETOPTUNION ValueUnion;
-    while ((rc = RTGetOpt(pGetState, &ValueUnion)) != 0)
-    {
-        switch (rc)
+    while ((ch = RTGetOpt(pGetState, &ValueUnion)) != 0)
+    {
+        switch (ch)
         {
             case 'b':
@@ -90 +90 @@
 
             default:
-                return RTGetOptPrintError(rc, &ValueUnion);
+                return RTGetOptPrintError(ch, &ValueUnion);
         }
     }
@@ -99 +99 @@
     RTEXITCODE          rcExit = RTEXITCODE_FAILURE;
     AUDIOTESTDRVSTACK   DrvStack;
-    rc = audioTestDriverStackInit(&DrvStack, pDrvReg, false /*fWithDrvAudio*/);
+    int rc = audioTestDriverStackInit(&DrvStack, pDrvReg, false /*fWithDrvAudio*/);
     if (RT_SUCCESS(rc))
     {
@@ -421 +421 @@
 
     /* Argument processing loop: */
-    int           rc;
+    int           ch;
     RTGETOPTUNION ValueUnion;
-    while ((rc = RTGetOpt(pGetState, &ValueUnion)) != 0)
-    {
-        switch (rc)
+    while ((ch = RTGetOpt(pGetState, &ValueUnion)) != 0)
+    {
+        switch (ch)
         {
             case 'b':
@@ -469 +469 @@
 
             default:
-                return RTGetOptPrintError(rc, &ValueUnion);
+                return RTGetOptPrintError(ch, &ValueUnion);
         }
     }
@@ -772 +772 @@
 
     /* Argument processing loop: */
-    int           rc;
+    int           ch;
     RTGETOPTUNION ValueUnion;
-    while ((rc = RTGetOpt(pGetState, &ValueUnion)) != 0)
-    {
-        switch (rc)
+    while ((ch = RTGetOpt(pGetState, &ValueUnion)) != 0)
+    {
+        switch (ch)
         {
             case 'b':
@@ -850 +850 @@
 
             default:
-                return RTGetOptPrintError(rc, &ValueUnion);
+                return RTGetOptPrintError(ch, &ValueUnion);
         }
     }