Changeset 26517 in vbox for trunk/src/VBox/NetworkServices/DHCP

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.

File:

• trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (2 diffs)

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -710 +710 @@
         { "--upper-ip",       'u',   RTGETOPT_REQ_IPV4ADDR },
         { "--netmask",        'm',   RTGETOPT_REQ_IPV4ADDR },
-
-        { "--help",           'h',   RTGETOPT_REQ_NOTHING },
-        { "--version ",       'V',   RTGETOPT_REQ_NOTHING },
     };
 
     RTGETOPTSTATE State;
-    int rc = RTGetOptInit(&State, argc, argv, &s_aOptionDefs[0], RT_ELEMENTS(s_aOptionDefs), 0, 0);
+    int rc = RTGetOptInit(&State, argc, argv, &s_aOptionDefs[0], RT_ELEMENTS(s_aOptionDefs), 0, 0 /*fFlags*/);
     AssertRCReturn(rc, 49);
 
@@ -833 +830 @@
                 return 1;
 
-            case VERR_GETOPT_UNKNOWN_OPTION:
-            case VINF_GETOPT_NOT_OPTION:
-                RTPrintf("Unknown option '%s'. Use --help for more information.\n", Val.psz);
-                return 1;
-
             default:
-                break;
+                rc = RTGetOptPrintError(rc, &Val);
+                RTPrintf("Use --help for more information.\n");
+                return rc;
         }
     }