From 182057e88102e44ebed067861b719f9b6da3d958 Mon Sep 17 00:00:00 2001 From: Stephen Shelton Date: Wed, 26 Feb 2020 14:07:07 -0700 Subject: [PATCH] Remove 'clang-format off' and make format --- daemon/lokinetctl.cpp | 26 +++++++++++++------------- daemon/main.cpp | 32 ++++++++++++++++---------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/daemon/lokinetctl.cpp b/daemon/lokinetctl.cpp index e15ca3466..6dfd7360b 100644 --- a/daemon/lokinetctl.cpp +++ b/daemon/lokinetctl.cpp @@ -109,21 +109,21 @@ namespace int main(int argc, char* argv[]) { - // clang-format off - cxxopts::Options options( - "lokinetctl", - "LokiNET is a free, open source, private, decentralized, \"market based sybil resistant\" and IP based onion routing network" - ); - - options.add_options() - ("v,verbose", "Verbose", cxxopts::value()) - ("h,help", "help", cxxopts::value()) - ("c,config", "config file", cxxopts::value()->default_value(llarp::GetDefaultConfigPath().string())) + cxxopts::Options options("lokinetctl", + "LokiNET is a free, open source, private, " + "decentralized, \"market based sybil resistant\" " + "and IP based onion routing network"); + + options.add_options()("v,verbose", "Verbose", cxxopts::value< bool >())( + "h,help", "help", cxxopts::value< bool >())( + "c,config", "config file", + cxxopts::value< std::string >()->default_value( + llarp::GetDefaultConfigPath().string())) #ifdef WITH_CURL - ("j,jsonrpc", "hit json rpc endpoint", cxxopts::value()) + ("j,jsonrpc", "hit json rpc endpoint", cxxopts::value< std::string >()) #endif - ("dump", "dump rc file", cxxopts::value >(), "FILE"); - // clang-format on + ("dump", "dump rc file", + cxxopts::value< std::vector< std::string > >(), "FILE"); try { diff --git a/daemon/main.cpp b/daemon/main.cpp index 3c8e4e7d3..594ebb321 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -102,24 +102,24 @@ main(int argc, char *argv[]) // SetUnhandledExceptionFilter(win32_signal_handler); #endif - // clang-format off - cxxopts::Options options( - "lokinet", - "LokiNET is a free, open source, private, decentralized, \"market based sybil resistant\" and IP based onion routing network" - ); - options.add_options() - ("v,verbose", "Verbose", cxxopts::value()) - ("h,help", "help", cxxopts::value()) - ("version", "version", cxxopts::value()) - ("g,generate", "generate client config", cxxopts::value()) - ("r,router", "generate router config", cxxopts::value()) - ("f,force", "overwrite", cxxopts::value()) - ("c,colour", "colour output", cxxopts::value()->default_value("true")) - ("b,background", "background mode (start, but do not connect to the network)", cxxopts::value()) - ("config","path to configuration file", cxxopts::value()); + cxxopts::Options options("lokinet", + "LokiNET is a free, open source, private, " + "decentralized, \"market based sybil resistant\" " + "and IP based onion routing network"); + options.add_options()("v,verbose", "Verbose", cxxopts::value< bool >())( + "h,help", "help", cxxopts::value< bool >())("version", "version", + cxxopts::value< bool >())( + "g,generate", "generate client config", cxxopts::value< bool >())( + "r,router", "generate router config", cxxopts::value< bool >())( + "f,force", "overwrite", cxxopts::value< bool >())( + "c,colour", "colour output", + cxxopts::value< bool >()->default_value("true"))( + "b,background", + "background mode (start, but do not connect to the network)", + cxxopts::value< bool >())("config", "path to configuration file", + cxxopts::value< std::string >()); options.parse_positional("config"); - // clang-format on bool genconfigOnly = false; bool asRouter = false;