Changeset 63301 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

Aug 10, 2016 8:45:33 PM (9 years ago)

Author:

vboxsync

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

109934

Message:

DHCP: DIFx killable window seems to have to lost when we enabled hardening (will do same for NAT in a bit).

File:

• trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp (modified) (6 diffs)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -247 +247 @@
  * @param   argc    Argument count.
  * @param   argv    Argument vector.
+ *
+ * @todo r=bird: The --help and --version options shall not return a
+ *               non-zero exit code.  So, this method need to grow some
+ *               complexity.  I'm to blame for that blunder :/
  */
 int VBoxNetBaseService::parseArgs(int argc, char **argv)
@@ -295 +299 @@
                 {
                     RTStrmPrintf(g_pStdErr, "Invalid trunk type '%s'\n", Val.psz);
-                    return 1;
+                    return RTEXITCODE_SYNTAX;
                 }
                 break;
@@ -317 +321 @@
             case 'V': // --version (missed)
                 RTPrintf("%sr%u\n", RTBldCfgVersion(), RTBldCfgRevision());
-                return 1;
+                return 1; /** @todo this exit code is wrong, of course. :/ */
 
             case 'M': // --need-main
@@ -338 +342 @@
                     RTPrintf("    -%c, %s\n", m->m_vecOptionDefs[i]->iShort, m->m_vecOptionDefs[i]->pszLong);
                 usage(); /* to print Service Specific usage */
-                return 1;
+                return 1; /** @todo this exit code is wrong, of course. :/ */
 
             default:
@@ -345 +349 @@
                 if (RT_FAILURE(rc1))
                 {
-                    rc = RTGetOptPrintError(rc, &Val);
+                    RTEXITCODE rcExit = RTGetOptPrintError(rc, &Val);
                     RTPrintf("Use --help for more information.\n");
-                    return rc;
+                    return rcExit;
                 }
                 break;
@@ -355 +359 @@
 
     RTMemFree(paOptionArray);
-    return rc;
+    return RTEXITCODE_SUCCESS;
 }