diff options
author | Håvard Pettersen <havardpe@oath.com> | 2022-03-31 11:44:10 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2022-04-01 10:24:32 +0000 |
commit | d71f76a73fe54558f613e75a3a8cfd70fc46a7e8 (patch) | |
tree | 7d170e5b792dbf5fed06ff7c7b2db398b6cb64c7 /slobrok | |
parent | 1bb3dd192f4bcb91e710fe19ca54b2b8935ffb83 (diff) |
use getopt/getopt_long directly
Diffstat (limited to 'slobrok')
-rw-r--r-- | slobrok/src/apps/slobrok/slobrok.cpp | 9 | ||||
-rw-r--r-- | slobrok/src/tests/startsome/tstdst.cpp | 11 |
2 files changed, 9 insertions, 11 deletions
diff --git a/slobrok/src/apps/slobrok/slobrok.cpp b/slobrok/src/apps/slobrok/slobrok.cpp index a662c59d979..791b98996fe 100644 --- a/slobrok/src/apps/slobrok/slobrok.cpp +++ b/slobrok/src/apps/slobrok/slobrok.cpp @@ -4,6 +4,7 @@ #include <vespa/vespalib/util/exceptions.h> #include <vespa/fastos/app.h> #include <csignal> +#include <unistd.h> #include <vespa/log/log.h> LOG_SETUP("vespa-slobrok"); @@ -51,16 +52,14 @@ App::Main() uint32_t portnum = 2773; vespalib::string cfgId; - int argi = 1; - const char* optArg; int c; - while ((c = GetOpt("c:s:p:N", optArg, argi)) != -1) { + while ((c = getopt(_argc, _argv, "c:s:p:N")) != -1) { switch (c) { case 'c': - cfgId = std::string(optArg); + cfgId = std::string(optarg); break; case 'p': - portnum = atoi(optArg); + portnum = atoi(optarg); break; case 'N': // ignored diff --git a/slobrok/src/tests/startsome/tstdst.cpp b/slobrok/src/tests/startsome/tstdst.cpp index cd38e6cbf97..8e58fc23b27 100644 --- a/slobrok/src/tests/startsome/tstdst.cpp +++ b/slobrok/src/tests/startsome/tstdst.cpp @@ -7,6 +7,7 @@ #include <vespa/fnet/transport.h> #include <vespa/fnet/frt/target.h> #include <sstream> +#include <unistd.h> #include <vespa/log/log.h> LOG_SETUP("testrpcserver"); @@ -187,19 +188,17 @@ public: int myport = 2774; const char *rpcsrvname = "testrpcsrv/17"; - int argi = 1; - const char* optArg; int c; - while ((c = GetOpt("n:p:s:", optArg, argi)) != -1) { + while ((c = getopt(_argc, _argv, "n:p:s:")) != -1) { switch (c) { case 'p': - myport = atoi(optArg); + myport = atoi(optarg); break; case 's': - sbport = atoi(optArg); + sbport = atoi(optarg); break; case 'n': - rpcsrvname = optArg; + rpcsrvname = optarg; break; default: LOG(error, "unknown option letter '%c'", c); |