Merge pull request #1144 from notlesh/only-limp-tabs-2020-02-26

Remove 'clang-format off' and make format

daemon/lokinetctl.cpp

@@ -109,21 +109,21 @@ namespace
 int
 main(int argc, char* argv[])
 {
-  // clang-format off
+  cxxopts::Options options("lokinetctl",
-  cxxopts::Options options(
+                           "LokiNET is a free, open source, private, "
-    "lokinetctl",
+                           "decentralized, \"market based sybil resistant\" "
-    "LokiNET is a free, open source, private, decentralized, \"market based sybil resistant\" and IP based onion routing network"
+                           "and IP based onion routing network");
-  );
+
-
+  options.add_options()("v,verbose", "Verbose", cxxopts::value< bool >())(
-  options.add_options()
+      "h,help", "help", cxxopts::value< bool >())(
-      ("v,verbose", "Verbose", cxxopts::value<bool>())
+      "c,config", "config file",
-      ("h,help", "help", cxxopts::value<bool>())
+      cxxopts::value< std::string >()->default_value(
-      ("c,config", "config file", cxxopts::value<std::string>()->default_value(llarp::GetDefaultConfigPath().string()))
+          llarp::GetDefaultConfigPath().string()))
 #ifdef WITH_CURL
-      ("j,jsonrpc", "hit json rpc endpoint", cxxopts::value<std::string>())
+      ("j,jsonrpc", "hit json rpc endpoint", cxxopts::value< std::string >())
 #endif
-      ("dump", "dump rc file", cxxopts::value<std::vector<std::string> >(), "FILE");
+          ("dump", "dump rc file",
-  // clang-format on
+           cxxopts::value< std::vector< std::string > >(), "FILE");
 
   try
   {

daemon/main.cpp

@@ -102,24 +102,24 @@ main(int argc, char *argv[])
   // SetUnhandledExceptionFilter(win32_signal_handler);
 #endif
 
-  // clang-format off
+  cxxopts::Options options("lokinet",
-  cxxopts::Options options(
+                           "LokiNET is a free, open source, private, "
-		"lokinet",
+                           "decentralized, \"market based sybil resistant\" "
-		"LokiNET is a free, open source, private, decentralized, \"market based sybil resistant\" and IP based onion routing network"
+                           "and IP based onion routing network");
-    );
+  options.add_options()("v,verbose", "Verbose", cxxopts::value< bool >())(
-  options.add_options()
+      "h,help", "help", cxxopts::value< bool >())("version", "version",
-		("v,verbose", "Verbose", cxxopts::value<bool>())
+                                                  cxxopts::value< bool >())(
-		("h,help", "help", cxxopts::value<bool>())
+      "g,generate", "generate client config", cxxopts::value< bool >())(
-		("version", "version", cxxopts::value<bool>())
+      "r,router", "generate router config", cxxopts::value< bool >())(
-		("g,generate", "generate client config", cxxopts::value<bool>())
+      "f,force", "overwrite", cxxopts::value< bool >())(
-		("r,router", "generate router config", cxxopts::value<bool>())
+      "c,colour", "colour output",
-		("f,force", "overwrite", cxxopts::value<bool>())
+      cxxopts::value< bool >()->default_value("true"))(
-		("c,colour", "colour output", cxxopts::value<bool>()->default_value("true"))
+      "b,background",
-		("b,background", "background mode (start, but do not connect to the network)", cxxopts::value<bool>())
+      "background mode (start, but do not connect to the network)",
-    ("config","path to configuration file", cxxopts::value<std::string>());
+      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;