--version commandline-parameter cleanup.
This commit is contained in:
parent
cebc909cf1
commit
e799e7e7e2
17
src/proxy.cc
17
src/proxy.cc
|
@ -15,22 +15,21 @@
|
|||
|
||||
|
||||
struct Options {
|
||||
Options() : daemonize{}, show_version{} { }
|
||||
Options() : daemonize{} { }
|
||||
|
||||
bool daemonize;
|
||||
bool show_version;
|
||||
};
|
||||
|
||||
|
||||
static Options parse_commandline(int argc, char** argv)
|
||||
{
|
||||
Options options;
|
||||
bool show_help{};
|
||||
bool show_help{}, show_version{};
|
||||
|
||||
auto cli = (
|
||||
clipp::option("-d", "--daemonize").set(options.daemonize).doc("Fork to background."),
|
||||
clipp::option("--help").set(show_help).doc("Show help and exit."),
|
||||
clipp::option("--version").set(options.show_version).doc("Show version and exit.")
|
||||
clipp::option("--version").set(show_version).doc("Show version and exit.")
|
||||
);
|
||||
|
||||
if (!clipp::parse(argc, argv, cli) || show_help) {
|
||||
|
@ -38,7 +37,7 @@ static Options parse_commandline(int argc, char** argv)
|
|||
std::exit(0);
|
||||
}
|
||||
|
||||
if (options.show_version) {
|
||||
if (show_version) {
|
||||
std::cout
|
||||
<< argv[0] << '\n'
|
||||
<< "Using resply version " << resply::version() << std::endl;
|
||||
|
@ -55,14 +54,6 @@ int main(int argc, char* argv[])
|
|||
|
||||
auto options{parse_commandline(argc, argv)};
|
||||
|
||||
if (options.show_version) {
|
||||
std::cout
|
||||
<< argv[0] << '\n'
|
||||
<< "Using resply version " << resply::version() << std::endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
google::protobuf::ShutdownProtobufLibrary();
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -17,23 +17,22 @@
|
|||
|
||||
|
||||
struct Options {
|
||||
Options() : host{"localhost:6379"}, show_version{} { }
|
||||
Options() : host{"localhost:6379"} { }
|
||||
|
||||
std::string host;
|
||||
bool show_version;
|
||||
};
|
||||
|
||||
|
||||
static Options parse_commandline(int argc, char** argv)
|
||||
{
|
||||
Options options;
|
||||
bool show_help{};
|
||||
bool show_help{}, show_version{};
|
||||
|
||||
auto cli = (
|
||||
clipp::option("-h", "--host").set(options.host)
|
||||
.doc("Set the host (and port, optional) to connect to [default: localhost:6379]"),
|
||||
clipp::option("--help").set(show_help).doc("Show help and exit."),
|
||||
clipp::option("--version").set(options.show_version).doc("Show version and exit.")
|
||||
clipp::option("--version").set(show_version).doc("Show version and exit.")
|
||||
);
|
||||
|
||||
if (!clipp::parse(argc, argv, cli) || show_help) {
|
||||
|
@ -41,7 +40,7 @@ static Options parse_commandline(int argc, char** argv)
|
|||
std::exit(0);
|
||||
}
|
||||
|
||||
if (options.show_version) {
|
||||
if (show_version) {
|
||||
std::cout
|
||||
<< argv[0] << '\n'
|
||||
<< "Using resply version " << resply::version() << std::endl;
|
||||
|
|
Reference in a new issue