common: modify 'main()s' to use new argv_to_vec() signature

A followup to PR #42820 that modified argv_to_vec() signature
(for style and performance).

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index 01858fccbe4cd2ab743c24ac0e1a67651e2bdfbe..5b2d370c49dc9fcd614544b1f8e90d4a44aa7fcf 100644 (file)
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -92,8 +92,7 @@ void usage()
 int main(int argc, const char **argv, const char *envp[]) {
   int filer_flags = 0;
   //cerr << "ceph-fuse starting " << myrank << "/" << world << std::endl;
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 0d6c5ed70649dcb7b8e41cf885f82df102192c0b..5a917fa807c478b31d3cba552ed5dc657834dce4 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -83,8 +83,7 @@ int main(int argc, const char **argv)
 {
   ceph_pthread_setname(pthread_self(), "ceph-mds");
 
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/ceph_mgr.cc b/src/ceph_mgr.cc
index a80eb2f2433071ad2f1d8847709ac13a86eadddd..67bda0c51bed2a34f23eec9ebc0c18d4ba783853 100644 (file)
--- a/src/ceph_mgr.cc
+++ b/src/ceph_mgr.cc
@@ -43,8 +43,7 @@ int main(int argc, const char **argv)
 {
   ceph_pthread_setname(pthread_self(), "ceph-mgr");
 
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     std::cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 5efcc13575fb3b70aad7e999c52a2828cf048929..4410e0dcb567b9a79b8222f792a2566b29ae67d8 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -260,8 +260,7 @@ int main(int argc, const char **argv)
   bool yes_really = false;
   std::string osdmapfn, inject_monmap, extract_monmap, crush_loc;
 
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/ceph_syn.cc b/src/ceph_syn.cc
index 38268c438e8440c7b613988e1cfde5c7e1cc6ca0..9e1d6a878615b4d738d48a980431e920fe3a31c3 100644 (file)
--- a/src/ceph_syn.cc
+++ b/src/ceph_syn.cc
@@ -41,8 +41,7 @@ extern int syn_filer_flags;
 int main(int argc, const char **argv, char *envp[]) 
 {
   //cerr << "ceph-syn starting" << std::endl;
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/dokan/ceph_dokan.cc b/src/dokan/ceph_dokan.cc
index 92dfa5a3fb398bd4d1116b24241c8f87fc6337c0..35c82a2715c9e4b137447c88326f224db0763f8a 100644 (file)
--- a/src/dokan/ceph_dokan.cc
+++ b/src/dokan/ceph_dokan.cc
@@ -989,8 +989,7 @@ int do_map() {
 boost::intrusive_ptr<CephContext> do_global_init(
   int argc, const char **argv, Command cmd)
 {
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   code_environment_t code_env;
   int flags;
@@ -1032,8 +1031,7 @@ int main(int argc, const char** argv)
   g_cfg = new Config;
 
   Command cmd = Command::None;
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   std::ostringstream err_msg;
   int r = parse_args(args, &err_msg, &cmd, g_cfg);
   if (r) {

diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index 63af614bcefdbde3370cc68f23f18a51c93523d7..424cbb85a10e61ef2550a6da9458fbcef247abab 100644 (file)
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -275,10 +275,8 @@ public:
 
   int conf_parse_argv(int argc, const char **argv)
   {
-    int ret;
-    vector<const char*> args;
-    argv_to_vec(argc, argv, args);
-    ret = cct->_conf.parse_argv(args);
+    auto args = argv_to_vec(argc, argv);
+    int ret = cct->_conf.parse_argv(args);
     if (ret)
        return ret;
     cct->_conf.apply_changes(nullptr);

diff --git a/src/librados/librados_c.cc b/src/librados/librados_c.cc
index edef71f1b27f1444e73fd6bb3094588b77a7e89a..a403a4b97623c17ad078e1d3c590184c0c4d8d2d 100644 (file)
--- a/src/librados/librados_c.cc
+++ b/src/librados/librados_c.cc
@@ -317,8 +317,7 @@ extern "C" int LIBRADOS_C_API_DEFAULT_F(rados_conf_parse_argv)(
   }
   librados::RadosClient *client = (librados::RadosClient *)cluster;
   auto& conf = client->cct->_conf;
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   int ret = conf.parse_argv(args);
   if (ret) {
     tracepoint(librados, rados_conf_parse_argv_exit, ret);

diff --git a/src/log/test.cc b/src/log/test.cc
index 4d11f73a0fa8e289c6036143def8f3b4b3bf48cd..f1ea107518ed1efd17bccd476b530c183baf214e 100644 (file)
--- a/src/log/test.cc
+++ b/src/log/test.cc
@@ -369,10 +369,9 @@ TEST(Log, GarbleRecovery)
 
 int main(int argc, char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);

diff --git a/src/rbd_replay/rbd-replay.cc b/src/rbd_replay/rbd-replay.cc
index 2f13cf3121186b39e44a4490fd85c00613cb1fd0..d1bfafbd46bc499cfef83509204807f62111ea0c 100644 (file)
--- a/src/rbd_replay/rbd-replay.cc
+++ b/src/rbd_replay/rbd-replay.cc
@@ -55,9 +55,7 @@ static void usage(const char* program) {
 }
 
 int main(int argc, const char **argv) {
-  vector<const char*> args;
-
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 89f79a13de358b3959ed938f11c0a454ef4e99b4..e22010cb452d578cdbe88d6318928ba9f76c14c1 100644 (file)
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -752,14 +752,13 @@ int librgw_create(librgw_t* rgw, int argc, char **argv)
   if (! g_ceph_context) {
     std::lock_guard<std::mutex> lg(librgw_mtx);
     if (! g_ceph_context) {
-      vector<const char*> args;
       std::vector<std::string> spl_args;
       // last non-0 argument will be split and consumed
       if (argc > 1) {
        const std::string spl_arg{argv[(--argc)]};
        get_str_vec(spl_arg, " \t", spl_args);
       }
-      argv_to_vec(argc, const_cast<const char**>(argv), args);
+      auto args = argv_to_vec(argc, argv);
       // append split args, if any
       for (const auto& elt : spl_args) {
        args.push_back(elt.c_str());

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index d69a9e99f6aee48fa8c0ea4a672c5bf9256efd8f..9ef12b702c4b2537fc932a8ecc35585ffa244c28 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -3151,8 +3151,7 @@ void init_realm_param(CephContext *cct, string& var, std::optional<string>& opt_
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/rgw/rgw_es_main.cc b/src/rgw/rgw_es_main.cc
index e503d4a68574696e20e3652ddc51b1bbc7ed05d5..6cfbc9352926c944ddde13367ddda318309dfceb 100644 (file)
--- a/src/rgw/rgw_es_main.cc
+++ b/src/rgw/rgw_es_main.cc
@@ -16,8 +16,7 @@ using namespace std;
 
 int main(int argc, char *argv[])
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index aa3fdd4fc9b0d0d7b424c9796654d0032fd3ef61..4bb0364c2d4c18cca65923cedd135749bfb8b6ef 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -196,8 +196,7 @@ int radosgw_Main(int argc, const char **argv)
     { "ms_mon_client_mode", "secure" }
   };
 
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/rgw/rgw_object_expirer.cc b/src/rgw/rgw_object_expirer.cc
index 19d1ac460b3c126dab36e7b701c3a5aef296d47c..e2e82ad58b12e14d915498185196ef78f0713ce7 100644 (file)
--- a/src/rgw/rgw_object_expirer.cc
+++ b/src/rgw/rgw_object_expirer.cc
@@ -53,8 +53,7 @@ static void usage()
 
 int main(const int argc, const char **argv)
 {
-  vector<const char *> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/rgw/rgw_token.cc b/src/rgw/rgw_token.cc
index aaa4f47ca2c8467d481c86185af182bf4f1f6d0c..0d58671dbf2ddff0b1d232f102f4cefb30a2a6ad 100644 (file)
--- a/src/rgw/rgw_token.cc
+++ b/src/rgw/rgw_token.cc
@@ -62,9 +62,8 @@ void usage()
 
 int main(int argc, char **argv)
 {
+  auto args = argv_to_vec(argc, argv);
   std::string val;
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);
@@ -74,7 +73,7 @@ int main(int argc, char **argv)
     exit(0);
   }
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);
   common_init_finish(g_ceph_context);
 

diff --git a/src/test/ObjectMap/test_keyvaluedb_iterators.cc b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
index 15ee1f5b36ac26381bb8589bdb581f5552c889bd..061639ad94649ed6067d86183f45e2ceeb322d46 100644 (file)
--- a/src/test/ObjectMap/test_keyvaluedb_iterators.cc
+++ b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
@@ -1739,8 +1739,7 @@ TEST_F(EmptyStore, UpperBoundMockDB)
 
 int main(int argc, char *argv[])
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **) argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);

diff --git a/src/test/ObjectMap/test_object_map.cc b/src/test/ObjectMap/test_object_map.cc
index db19c17e8cd1ed6c17e4046442f641aa64da8261..1410b39b05645f4e1fba319d2953ffdfc2e3e440 100644 (file)
--- a/src/test/ObjectMap/test_object_map.cc
+++ b/src/test/ObjectMap/test_object_map.cc
@@ -657,8 +657,7 @@ public:
 
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/TestSignalHandlers.cc b/src/test/TestSignalHandlers.cc
index a1344e06fae6d4fb193eaf5a6c6bfcff342a4014..fb307ed9bdf6875534c45e96f1672f3b934ece12 100644 (file)
--- a/src/test/TestSignalHandlers.cc
+++ b/src/test/TestSignalHandlers.cc
@@ -77,8 +77,7 @@ typedef void (*test_fn_t)(void);
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/test/TestTimers.cc b/src/test/TestTimers.cc
index 98cb4f927b7d5b2e124481c031f3409f7138735d..78bdfd3a41bde15cbc98de564fb2646e27814fdb 100644 (file)
--- a/src/test/TestTimers.cc
+++ b/src/test/TestTimers.cc
@@ -246,10 +246,9 @@ static int safe_timer_cancellation_test(SafeTimer &safe_timer,
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);

diff --git a/src/test/bench_log.cc b/src/test/bench_log.cc
index e4855521bee0333ea58c80c7154fe45608b3fbf8..60fda462e87372e7f8b80fe916035ae75e911bc0 100644 (file)
--- a/src/test/bench_log.cc
+++ b/src/test/bench_log.cc
@@ -50,8 +50,7 @@ int main(int argc, const char **argv)
 
   cout << threads << " threads, " << num << " lines per thread" << std::endl;
 
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_OSD,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/client/main.cc b/src/test/client/main.cc
index b85399774f32df0ab58849689ad8c622b053c03c..dcd48acbbb231fc5ba7639fe06e3fc917acf4a21 100644 (file)
--- a/src/test/client/main.cc
+++ b/src/test/client/main.cc
@@ -21,8 +21,7 @@
  
 int main(int argc, char **argv)
 {
-  std::vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
   [[maybe_unused]] auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

diff --git a/src/test/common/get_command_descriptions.cc b/src/test/common/get_command_descriptions.cc
index b83605ec9bf99adc3bface123def239c29a165e4..88bc181912faa3712b0fa1dbfcd414ed914de187 100644 (file)
--- a/src/test/common/get_command_descriptions.cc
+++ b/src/test/common/get_command_descriptions.cc
@@ -97,8 +97,7 @@ static void pull585()
 }
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/daemon_config.cc b/src/test/daemon_config.cc
index f1e7945fe8ec4e37cb9720c7b363caff2d352ab7..c9afe54837aa782a64e9689ac068addedb8c31fd 100644 (file)
--- a/src/test/daemon_config.cc
+++ b/src/test/daemon_config.cc
@@ -131,8 +131,7 @@ TEST(DaemonConfig, ArgV) {
   const char *argv[] = { "foo", "--log-graylog-port", "22",
                         "--key", "my-key", NULL };
   size_t argc = (sizeof(argv) / sizeof(argv[0])) - 1;
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   g_ceph_context->_conf.parse_argv(args);
   g_ceph_context->_conf.apply_changes(nullptr);
 

diff --git a/src/test/direct_messenger/test_direct_messenger.cc b/src/test/direct_messenger/test_direct_messenger.cc
index 77093f13e47d0291a0a891fc563764ad9ee4c9a4..311fce161d64a89d46f2695eb2462e570bf7b5ac 100644 (file)
--- a/src/test/direct_messenger/test_direct_messenger.cc
+++ b/src/test/direct_messenger/test_direct_messenger.cc
@@ -424,8 +424,7 @@ TEST(DirectMessenger, StartWithoutPeer)
 int main(int argc, char **argv)
 {
   // command-line arguments
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_ANY,
                          CODE_ENVIRONMENT_DAEMON,

diff --git a/src/test/erasure-code/TestErasureCodeShec_all.cc b/src/test/erasure-code/TestErasureCodeShec_all.cc
index 9ee648aac124aef1a43cf6d9ed141b5e272e8d9c..401b8affc719e29f6a9f4691deaced5dbfd7fd83 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeShec_all.cc
+++ b/src/test/erasure-code/TestErasureCodeShec_all.cc
@@ -293,8 +293,7 @@ int main(int argc, char **argv)
     }
   }
 
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **) argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/erasure-code/TestErasureCodeShec_arguments.cc b/src/test/erasure-code/TestErasureCodeShec_arguments.cc
index 8e3c52a19c09981d485788a316894c4f2783affa..bd387654ff532a32766a2ee8479f3c62626bf074 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeShec_arguments.cc
+++ b/src/test/erasure-code/TestErasureCodeShec_arguments.cc
@@ -369,10 +369,7 @@ TEST(ParameterTest, combination_all)
 
 int main(int argc, char **argv)
 {
-  int r;
-
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **) argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
@@ -383,7 +380,7 @@ int main(int argc, char **argv)
 
   create_table_shec432();
 
-  r = RUN_ALL_TESTS();
+  int r = RUN_ALL_TESTS();
 
   std::cout << "minimum_to_decode:total_num = " << count_num
       << std::endl;

diff --git a/src/test/filestore/TestFileStore.cc b/src/test/filestore/TestFileStore.cc
index 1ae9849e4b253810b75c578cef8f25a5c4d701b1..02bc549e108437bfe2a81b21b7462efcd8c0979c 100644 (file)
--- a/src/test/filestore/TestFileStore.cc
+++ b/src/test/filestore/TestFileStore.cc
@@ -67,10 +67,9 @@ TEST(FileStore, create)
 }
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);

diff --git a/src/test/journal/test_main.cc b/src/test/journal/test_main.cc
index afb535d3111de2613c1ffed0dd5fd47b8eeb5cfa..d0131ae046dbe1e7b417f91bee13145a03df9e84 100644 (file)
--- a/src/test/journal/test_main.cc
+++ b/src/test/journal/test_main.cc
@@ -13,10 +13,9 @@ int main(int argc, char **argv)
 {
   ::testing::InitGoogleTest(&argc, argv);
 
-  std::vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_OSD,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_OSD,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_MON_CONFIG);
   g_conf().set_val("lockdep", "true");

diff --git a/src/test/kv_store_bench.cc b/src/test/kv_store_bench.cc
index bc35346e41d10a5c35ec976d56667d30a41fe222..f5de5a9117af2ad8f8fe2199f7865ac29c0b1ddd 100644 (file)
--- a/src/test/kv_store_bench.cc
+++ b/src/test/kv_store_bench.cc
@@ -55,8 +55,7 @@ KvStoreBench::~KvStoreBench()
 }
 
 int KvStoreBench::setup(int argc, const char** argv) {
-  vector<const char*> args;
-  argv_to_vec(argc,argv,args);
+  auto args = argv_to_vec(argc, argv);
   srand(time(NULL));
 
   stringstream help;

diff --git a/src/test/libcephsqlite/main.cc b/src/test/libcephsqlite/main.cc
index 28ab88e7cb965223b02a301563043ee426431a6b..40bab659cf362d246a3d51ef6e93191af9e0a437 100644 (file)
--- a/src/test/libcephsqlite/main.cc
+++ b/src/test/libcephsqlite/main.cc
@@ -1093,8 +1093,7 @@ out:
 
 
 int main(int argc, char **argv) {
-  std::vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   std::string conf_file_list;
   std::string cluster;

diff --git a/src/test/librados/asio.cc b/src/test/librados/asio.cc
index 12d56e85c6914240acc516f8037b86972a3a3464..f92c42c72a52f99061eec8d25294bc60b3c11de7 100644 (file)
--- a/src/test/librados/asio.cc
+++ b/src/test/librados/asio.cc
@@ -358,8 +358,7 @@ TEST_F(AsioRados, AsyncWriteOperationYield)
 
 int main(int argc, char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,

diff --git a/src/test/librgw_file.cc b/src/test/librgw_file.cc
index b206f24932cd3388dcac52821267e21808275b75..9dc9541acaa03765d6cf69f51aec520522903181 100644 (file)
--- a/src/test/librgw_file.cc
+++ b/src/test/librgw_file.cc
@@ -242,14 +242,10 @@ TEST(LibRGW, SHUTDOWN) {
 
 int main(int argc, char *argv[])
 {
-  char *v{nullptr};
-  string val;
-  vector<const char*> args;
-
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
-  v = getenv("AWS_ACCESS_KEY_ID");
+  char* v = getenv("AWS_ACCESS_KEY_ID");
   if (v) {
     access_key = v;
   }
@@ -259,6 +255,7 @@ int main(int argc, char *argv[])
     secret_key = v;
   }
 
+  string val;
   for (auto arg_iter = args.begin(); arg_iter != args.end();) {
     if (ceph_argparse_witharg(args, arg_iter, &val, "--access",
                              (char*) nullptr)) {

diff --git a/src/test/librgw_file_aw.cc b/src/test/librgw_file_aw.cc
index 224366b4360b731811ea7e431b33df915232869d..11c81ad7fd44d82435415affbc5d6aae387b9981 100644 (file)
--- a/src/test/librgw_file_aw.cc
+++ b/src/test/librgw_file_aw.cc
@@ -367,14 +367,10 @@ TEST(LibRGW, SHUTDOWN) {
 
 int main(int argc, char *argv[])
 {
-  char *v{nullptr};
-  string val;
-  vector<const char*> args;
-
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
-  v = getenv("AWS_ACCESS_KEY_ID");
+  char* v = getenv("AWS_ACCESS_KEY_ID");
   if (v) {
     access_key = v;
   }
@@ -384,6 +380,8 @@ int main(int argc, char *argv[])
     secret_key = v;
   }
 
+  string val;
+
   for (auto arg_iter = args.begin(); arg_iter != args.end();) {
     if (ceph_argparse_witharg(args, arg_iter, &val, "--access",
                              (char*) nullptr)) {

diff --git a/src/test/librgw_file_cd.cc b/src/test/librgw_file_cd.cc
index 8bbe350ac24553611b20cb27215db0d7eaaf007d..e0f18022e10c7aeaa17ba577bdc52e665d1b51fe 100644 (file)
--- a/src/test/librgw_file_cd.cc
+++ b/src/test/librgw_file_cd.cc
@@ -138,14 +138,10 @@ TEST(LibRGW, SHUTDOWN) {
 
 int main(int argc, char *argv[])
 {
-  char *v{nullptr};
-  string val;
-  vector<const char*> args;
-
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
-  v = getenv("AWS_ACCESS_KEY_ID");
+  char* v = getenv("AWS_ACCESS_KEY_ID");
   if (v) {
     access_key = v;
   }
@@ -155,6 +151,7 @@ int main(int argc, char *argv[])
     secret_key = v;
   }
 
+  string val;
   for (auto arg_iter = args.begin(); arg_iter != args.end();) {
     if (ceph_argparse_witharg(args, arg_iter, &val, "--access",
                              (char*) nullptr)) {

diff --git a/src/test/librgw_file_gp.cc b/src/test/librgw_file_gp.cc
index 757fdfd8da260ff05b68c4fa12c48dc27aacb256..56b61dce4be8e2ea1c4fd80728741b713f85b1b8 100644 (file)
--- a/src/test/librgw_file_gp.cc
+++ b/src/test/librgw_file_gp.cc
@@ -439,14 +439,10 @@ TEST(LibRGW, SHUTDOWN) {
 
 int main(int argc, char *argv[])
 {
-  char *v{nullptr};
-  string val;
-  vector<const char*> args;
-
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
-  v = getenv("AWS_ACCESS_KEY_ID");
+  char* v = getenv("AWS_ACCESS_KEY_ID");
   if (v) {
     access_key = v;
   }
@@ -456,6 +452,7 @@ int main(int argc, char *argv[])
     secret_key = v;
   }
 
+  string val;
   for (auto arg_iter = args.begin(); arg_iter != args.end();) {
     if (ceph_argparse_witharg(args, arg_iter, &val, "--access",
                              (char*) nullptr)) {

diff --git a/src/test/librgw_file_marker.cc b/src/test/librgw_file_marker.cc
index 3e2bce95e783bc82c991a239f233ecbfdf9f1453..9095fd9bfcf2ab617e831eb8548e6a7f2cf5677a 100644 (file)
--- a/src/test/librgw_file_marker.cc
+++ b/src/test/librgw_file_marker.cc
@@ -427,14 +427,10 @@ TEST(LibRGW, SHUTDOWN) {
 
 int main(int argc, char *argv[])
 {
-  char *v{nullptr};
-  string val;
-  vector<const char*> args;
-
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
-  v = getenv("AWS_ACCESS_KEY_ID");
+  char* v = getenv("AWS_ACCESS_KEY_ID");
   if (v) {
     access_key = v;
   }
@@ -444,6 +440,7 @@ int main(int argc, char *argv[])
     secret_key = v;
   }
 
+  string val;
   for (auto arg_iter = args.begin(); arg_iter != args.end();) {
     if (ceph_argparse_witharg(args, arg_iter, &val, "--access",
                              (char*) nullptr)) {

diff --git a/src/test/librgw_file_nfsns.cc b/src/test/librgw_file_nfsns.cc
index eb48a1ee71c05970d1c965c5a2b1dcca071e4138..c1e9c35c58b5857b406856bd7ab26f910645616b 100644 (file)
--- a/src/test/librgw_file_nfsns.cc
+++ b/src/test/librgw_file_nfsns.cc
@@ -1114,14 +1114,10 @@ TEST(LibRGW, SHUTDOWN) {
 
 int main(int argc, char *argv[])
 {
-  char *v{nullptr};
-  string val;
-  vector<const char*> args;
-
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
-  v = getenv("AWS_ACCESS_KEY_ID");
+  char* v = getenv("AWS_ACCESS_KEY_ID");
   if (v) {
     access_key = v;
   }
@@ -1131,6 +1127,7 @@ int main(int argc, char *argv[])
     secret_key = v;
   }
 
+  string val;
   for (auto arg_iter = args.begin(); arg_iter != args.end();) {
     if (ceph_argparse_witharg(args, arg_iter, &val, "--access",
                              (char*) nullptr)) {

diff --git a/src/test/librgw_file_xattr.cc b/src/test/librgw_file_xattr.cc
index 73902c4810bcd382908a56d7dd64e6e7e64af6bc..13c75becc2e0cf276f6ed3742526616df702f869 100644 (file)
--- a/src/test/librgw_file_xattr.cc
+++ b/src/test/librgw_file_xattr.cc
@@ -371,14 +371,10 @@ TEST(LibRGW, SHUTDOWN) {
 
 int main(int argc, char *argv[])
 {
-  char *v{nullptr};
-  string val;
-  vector<const char*> args;
-
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
-  v = getenv("AWS_ACCESS_KEY_ID");
+  char* v = getenv("AWS_ACCESS_KEY_ID");
   if (v) {
     access_key = v;
   }
@@ -388,6 +384,7 @@ int main(int argc, char *argv[])
     secret_key = v;
   }
 
+  string val;
   for (auto arg_iter = args.begin(); arg_iter != args.end();) {
     if (ceph_argparse_witharg(args, arg_iter, &val, "--access",
                              (char*) nullptr)) {

diff --git a/src/test/mon/test-mon-msg.cc b/src/test/mon/test-mon-msg.cc
index 4a05876154eedc74ed94bf66614f275c1ae484ea..1ec328d1f738a0b58e5a0bef143735d16f363b2f 100644 (file)
--- a/src/test/mon/test-mon-msg.cc
+++ b/src/test/mon/test-mon-msg.cc
@@ -325,8 +325,7 @@ TEST_F(MonMsgTest, MMonJoin)
 
 int main(int argc, char *argv[])
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(nullptr, args,
                         CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc
index 147ea8bcd04b0147ece4b940f6cc0e2fda36fd62..e62c5627b404f868ffa256e8221910afa7387d6d 100644 (file)
--- a/src/test/mon/test_mon_workloadgen.cc
+++ b/src/test/mon/test_mon_workloadgen.cc
@@ -990,11 +990,10 @@ int get_id_interval(int &first, int &last, string &str)
 
 int main(int argc, const char *argv[])
 {
-  vector<const char*> args;
   our_name = argv[0];
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
-  auto cct = global_init(NULL, args,
+  auto cct = global_init(nullptr, args,
                         CEPH_ENTITY_TYPE_OSD, CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
 

diff --git a/src/test/msgr/perf_msgr_client.cc b/src/test/msgr/perf_msgr_client.cc
index 0e5c5ab367f29353c95f4019da3319b3262b8fb5..20fff879bfdcdaf646f774bc4f6546f5a2cc8cb2 100644 (file)
--- a/src/test/msgr/perf_msgr_client.cc
+++ b/src/test/msgr/perf_msgr_client.cc
@@ -177,8 +177,7 @@ void usage(const string &name) {
 
 int main(int argc, char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/msgr/perf_msgr_server.cc b/src/test/msgr/perf_msgr_server.cc
index f17f90f6d081a6c1c0086c2e4728a249509eefa2..aec5923fcbfea36865355181580b97f6ecf09a2b 100644 (file)
--- a/src/test/msgr/perf_msgr_server.cc
+++ b/src/test/msgr/perf_msgr_server.cc
@@ -144,8 +144,7 @@ void usage(const string &name) {
 
 int main(int argc, char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/msgr/test_frames_v2.cc b/src/test/msgr/test_frames_v2.cc
index cbcf6cab48dc8c85c533a47c7a146702845b23c3..b164ceb4ad2411eaef4d544c10ac2ae9821405b7 100644 (file)
--- a/src/test/msgr/test_frames_v2.cc
+++ b/src/test/msgr/test_frames_v2.cc
@@ -469,10 +469,9 @@ INSTANTIATE_TEST_SUITE_P(
 }  // namespace ceph::msgr::v2
 
 int main(int argc, char* argv[]) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char**)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,
                          CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);

diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc
index 68133224c21c89231f91e00668cfeee92f40bf10..d2af3ab66be7c3ff9d48fa8caf4c843311618d52 100644 (file)
--- a/src/test/msgr/test_msgr.cc
+++ b/src/test/msgr/test_msgr.cc
@@ -2340,8 +2340,7 @@ INSTANTIATE_TEST_SUITE_P(
 );
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/neorados/list_pool.cc b/src/test/neorados/list_pool.cc
index 86039204070c1759e36232a25735b651f6154926..ae36c36e65523b16e7d278033a5c16f89e8f9cd6 100644 (file)
--- a/src/test/neorados/list_pool.cc
+++ b/src/test/neorados/list_pool.cc
@@ -127,8 +127,7 @@ int main(int argc, char** argv)
 {
   using namespace std::literals;
 
-  std::vector<const char*> args;
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,

diff --git a/src/test/neorados/start_stop.cc b/src/test/neorados/start_stop.cc
index a2475e3118008a4927fd9a7beba96e628da90497..4ea0ae5644fb1238a03102066c1f51e35401fa7d 100644 (file)
--- a/src/test/neorados/start_stop.cc
+++ b/src/test/neorados/start_stop.cc
@@ -30,11 +30,10 @@ int main(int argc, char** argv)
 {
   using namespace std::literals;
 
-  std::vector<const char*> args;
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);
   common_init_finish(cct.get());
 

diff --git a/src/test/objectstore/ObjectStoreTransactionBenchmark.cc b/src/test/objectstore/ObjectStoreTransactionBenchmark.cc
index 414608e042028feb3bf39ec527078ca4571a099d..e2ce3b2ef08cb07a00c78de99b8e6135fdd108b8 100644 (file)
--- a/src/test/objectstore/ObjectStoreTransactionBenchmark.cc
+++ b/src/test/objectstore/ObjectStoreTransactionBenchmark.cc
@@ -241,8 +241,7 @@ void usage(const string &name) {
 
 int main(int argc, char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/objectstore/chain_xattr.cc b/src/test/objectstore/chain_xattr.cc
index c7bf09e7e92c87776b393e3421b65025d781f216..a0db4e153d58f03d7dab9c41f19162db15d37449 100644 (file)
--- a/src/test/objectstore/chain_xattr.cc
+++ b/src/test/objectstore/chain_xattr.cc
@@ -437,10 +437,9 @@ TEST(chain_xattr, skip_chain_cleanup_and_ensure_single_attr)
 }
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index 16133241fd7af39fe6772f41b093fa0996fa0d39..fa4fb69e62e8d606c206e00c22ce2d9bcaaedac7 100644 (file)
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -9387,9 +9387,7 @@ TEST_P(StoreTestSpecificAUSize, Ticket45195Repro) {
 #endif  // WITH_BLUESTORE
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/objectstore/test_bdev.cc b/src/test/objectstore/test_bdev.cc
index e5e591a38c4d31ac22b249100616731fc09aa1c4..628b586bc2fb6af6362f63401c27894a06f0f1b9 100755 (executable)
--- a/src/test/objectstore/test_bdev.cc
+++ b/src/test/objectstore/test_bdev.cc
@@ -92,9 +92,7 @@ TEST(KernelDevice, Ticket45337) {
 }
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   map<string,string> defaults = {
     { "debug_bdev", "1/20" }
   };

diff --git a/src/test/objectstore/test_bluefs.cc b/src/test/objectstore/test_bluefs.cc
index 1de92744868fa91d4a8512ae109bec37fa1f1e81..d868c876e1ef98ea8405128c4934b4b5066a3b8b 100644 (file)
--- a/src/test/objectstore/test_bluefs.cc
+++ b/src/test/objectstore/test_bluefs.cc
@@ -829,9 +829,7 @@ TEST(BlueFS, test_tracker_50965) {
 }
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   map<string,string> defaults = {
     { "debug_bluefs", "1/20" },
     { "debug_bdev", "1/20" }

diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc
index e3b14f9c27288bd1d9e7e44a9a6066642241ddfa..c8a62a125276b2b06187944b8ce599db2e171c4b 100644 (file)
--- a/src/test/objectstore/test_bluestore_types.cc
+++ b/src/test/objectstore/test_bluestore_types.cc
@@ -1691,8 +1691,7 @@ TEST(bluestore_blob_t, unused)
 }
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/objectstore/test_idempotent.cc b/src/test/objectstore/test_idempotent.cc
index 267f4e7c96b5b78485b806a2b732efa296f11a14..a2af4073ee518c170d92531e12fd1db22ac8dc0c 100644 (file)
--- a/src/test/objectstore/test_idempotent.cc
+++ b/src/test/objectstore/test_idempotent.cc
@@ -41,9 +41,7 @@ typename T::iterator rand_choose(T &cont) {
 }
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/objectstore/test_idempotent_sequence.cc b/src/test/objectstore/test_idempotent_sequence.cc
index de053859e7ace836fdcf0f9ea810a3992afa4992..cac395c36fc0b7aaf861d3e86e221b16cf2473b5 100644 (file)
--- a/src/test/objectstore/test_idempotent_sequence.cc
+++ b/src/test/objectstore/test_idempotent_sequence.cc
@@ -212,9 +212,8 @@ int run_command(std::string& command, std::vector<std::string>& args)
 
 int main(int argc, const char *argv[])
 {
-  vector<const char*> args;
   our_name = argv[0];
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args,
                         CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/objectstore/test_kv.cc b/src/test/objectstore/test_kv.cc
index 1de904adc23ac72b1f3bb70d94a303422daf9710..5917f140b10847224ce75dfdfac9c73c9381740e 100644 (file)
--- a/src/test/objectstore/test_kv.cc
+++ b/src/test/objectstore/test_kv.cc
@@ -1289,9 +1289,7 @@ INSTANTIATE_TEST_SUITE_P(
                    "Betelgeuse(3) D(3)"));
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/objectstore/test_memstore_clone.cc b/src/test/objectstore/test_memstore_clone.cc
index 2a0ea093f86baf86268153a1d5fdb570169de33c..507f74d22d2d86c2e7f829a2c0dbe9e8f5c4ac7a 100644 (file)
--- a/src/test/objectstore/test_memstore_clone.cc
+++ b/src/test/objectstore/test_memstore_clone.cc
@@ -191,9 +191,7 @@ int main(int argc, char** argv)
     { "memstore_page_size", "4" }
   };
 
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(&defaults, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/objectstore_bench.cc b/src/test/objectstore_bench.cc
index da29599cf83aa46f795dcce60472beb034c46bd1..65a2987d08d80db5a53969dca1db602737ac41f5 100644 (file)
--- a/src/test/objectstore_bench.cc
+++ b/src/test/objectstore_bench.cc
@@ -149,11 +149,8 @@ void osbench_worker(ObjectStore *os, const Config &cfg,
 
 int main(int argc, const char *argv[])
 {
-  Config cfg;
-
   // command-line arguments
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
@@ -168,6 +165,7 @@ int main(int argc, const char *argv[])
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
 
+  Config cfg;
   std::string val;
   vector<const char*>::iterator i = args.begin();
   while (i != args.end()) {

diff --git a/src/test/omap_bench.cc b/src/test/omap_bench.cc
index e34387d72aef6522a6ab55bbdc089b9387503fef..714774f12c5bfe99fa63bc678ecf4e9209758f84 100644 (file)
--- a/src/test/omap_bench.cc
+++ b/src/test/omap_bench.cc
@@ -31,8 +31,7 @@ using ceph::bufferlist;
 
 int OmapBench::setup(int argc, const char** argv) {
   //parse key_value_store_bench args
-  vector<const char*> args;
-  argv_to_vec(argc,argv,args);
+  auto args = argv_to_vec(argc, argv);
   for (unsigned i = 0; i < args.size(); i++) {
     if(i < args.size() - 1) {
       if (strcmp(args[i], "-t") == 0) {

diff --git a/src/test/os/TestLFNIndex.cc b/src/test/os/TestLFNIndex.cc
index 053af6db22abe255fa0a830c83238e473bfd1f35..c0976fcf1a9f19b45a6dec36b9a38028df24476e 100644 (file)
--- a/src/test/os/TestLFNIndex.cc
+++ b/src/test/os/TestLFNIndex.cc
@@ -472,8 +472,7 @@ int main(int argc, char **argv) {
   if (ret < 0) {
     cerr << "SKIP LFNIndex because unable to test for xattr" << std::endl;
   } else {
-    vector<const char*> args;
-    argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
     auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                           CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/osd/ceph_test_osd_stale_read.cc b/src/test/osd/ceph_test_osd_stale_read.cc
index 5623d47f65eac6bd5ee17f10a4674dba93b099b6..7ee1255ed0f85ec4995fde6272c41782be0312b1 100644 (file)
--- a/src/test/osd/ceph_test_osd_stale_read.cc
+++ b/src/test/osd/ceph_test_osd_stale_read.cc
@@ -168,9 +168,8 @@ TEST(OSD, StaleRead) {
 }
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto args = argv_to_vec(argc, argv);
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);
   common_init_finish(g_ceph_context);
   ::testing::InitGoogleTest(&argc, argv);

diff --git a/src/test/osdc/object_cacher_stress.cc b/src/test/osdc/object_cacher_stress.cc
index f69905017f1b65bd998052af870f67947db4b06f..096f9b49ebfe6a3cdff0a68eab818bd75b965d53 100644 (file)
--- a/src/test/osdc/object_cacher_stress.cc
+++ b/src/test/osdc/object_cacher_stress.cc
@@ -353,9 +353,8 @@ int correctness_test(uint64_t delay_ns)
 
 int main(int argc, const char **argv)
 {
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto args = argv_to_vec(argc, argv);
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
 

diff --git a/src/test/perf_local.cc b/src/test/perf_local.cc
index 460411fc0d5281ea776bd077c41da20ffb586296..6c733acf9e815419801a6e7547b88041b86da396 100644 (file)
--- a/src/test/perf_local.cc
+++ b/src/test/perf_local.cc
@@ -1033,8 +1033,7 @@ void run_test(TestInfo& info)
 
 int main(int argc, char *argv[])
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/rbd_mirror/random_write.cc b/src/test/rbd_mirror/random_write.cc
index 4a473ed34669ff9262aaeef41a6412cd74d2cbc2..cf5315048f04bdeaeb8bf6147376fecaf02d24fc 100644 (file)
--- a/src/test/rbd_mirror/random_write.cc
+++ b/src/test/rbd_mirror/random_write.cc
@@ -150,8 +150,7 @@ void write_image(librbd::Image &image) {
 
 int main(int argc, const char **argv)
 {
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     std::cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);
@@ -161,7 +160,7 @@ int main(int argc, const char **argv)
     exit(0);
   }
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,
                          CINIT_FLAG_NO_MON_CONFIG);
 

diff --git a/src/test/rgw/test_http_manager.cc b/src/test/rgw/test_http_manager.cc
index 599266731d8a82ab4b843144a35401808bd949f3..418c6da022c74ba0bbc72f2dd51527f4dc70c0b5 100644 (file)
--- a/src/test/rgw/test_http_manager.cc
+++ b/src/test/rgw/test_http_manager.cc
@@ -105,9 +105,7 @@ TEST(HTTPManager, SignalThread)
 
 int main(int argc, char** argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/rgw/test_rgw_crypto.cc b/src/test/rgw/test_rgw_crypto.cc
index edf24f41bb68e5a050c96ad6d68b143d16f2a003..bff15deb5d04f18596aae73ff7710fd0707b3b94 100644 (file)
--- a/src/test/rgw/test_rgw_crypto.cc
+++ b/src/test/rgw/test_rgw_crypto.cc
@@ -797,9 +797,7 @@ TEST(TestRGWCrypto, verify_Encrypt_Decrypt)
 
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/rgw/test_rgw_manifest.cc b/src/test/rgw/test_rgw_manifest.cc
index 8ccf17c94713de06b84e1e14ea26e10b36e229ea..ee92248d00889081a5b1e26e9246821dc7e032b1 100644 (file)
--- a/src/test/rgw/test_rgw_manifest.cc
+++ b/src/test/rgw/test_rgw_manifest.cc
@@ -386,9 +386,7 @@ TEST(TestRGWManifest, old_obj_manifest) {
 
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/rgw/test_rgw_period_history.cc b/src/test/rgw/test_rgw_period_history.cc
index 39c173ac430784fd50bb8f1ebbf162d928099d30..a3589934f4470f40c325525117faf600817b4dc7 100644 (file)
--- a/src/test/rgw/test_rgw_period_history.cc
+++ b/src/test/rgw/test_rgw_period_history.cc
@@ -325,9 +325,7 @@ TEST(PeriodHistory, AttachAfter)
 
 int main(int argc, char** argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/test_c2c.cc b/src/test/test_c2c.cc
index a8b12dadd41128b9192f32cddc260ef955e7497d..5fe1ac2f1fcded32c01e7e0c10a7862aa9742f5f 100644 (file)
--- a/src/test/test_c2c.cc
+++ b/src/test/test_c2c.cc
@@ -34,8 +34,7 @@ void sigterm_handler(int signum)
 int main(int argc, const char **argv)
 {
   int ret = 0;
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/test_cors.cc b/src/test/test_cors.cc
index 9cb735b5c1a78b37588931dbde53133325a4499c..2df022f80a3d53b9cfe6885aeded58a627a1d007 100644 (file)
--- a/src/test/test_cors.cc
+++ b/src/test/test_cors.cc
@@ -869,8 +869,7 @@ TEST(TestCORS, deletecors_test){
 }
 
 int main(int argc, char *argv[]){
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/test_features.cc b/src/test/test_features.cc
index 5a13647e9f1fd8d71c2ede2cc4f3a0b437edec27..1ae758bfb343bcd4d9ad22eed78a9e020f2af01a 100644 (file)
--- a/src/test/test_features.cc
+++ b/src/test/test_features.cc
@@ -35,10 +35,9 @@ TEST(features, release_from_features) {
 
 int main(int argc, char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);

diff --git a/src/test/test_filejournal.cc b/src/test/test_filejournal.cc
index 356b1932328b4621cb8ad6aa26d8560e6e2e97c1..f985b2c155a2278f595e1df8771e455b2a656af0 100644 (file)
--- a/src/test/test_filejournal.cc
+++ b/src/test/test_filejournal.cc
@@ -64,8 +64,7 @@ unsigned size_mb = 200;
 const char GTEST_PRFIX[] = "--gtest_";
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/test_mempool.cc b/src/test/test_mempool.cc
index 4b8c144be23a60bda939c3b717af80cb5d9cd5f2..9dd96682f360f1578d2e29a312a72d7362935da2 100644 (file)
--- a/src/test/test_mempool.cc
+++ b/src/test/test_mempool.cc
@@ -436,8 +436,7 @@ TEST(mempool, check_shard_select)
 
 int main(int argc, char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/test_mutate.cc b/src/test/test_mutate.cc
index 98841e7cc09496e78de7d02fc090bdfecd15a179..04475f6174dfdf1ec47e51186529c6b6b7d3bb10 100644 (file)
--- a/src/test/test_mutate.cc
+++ b/src/test/test_mutate.cc
@@ -40,9 +40,7 @@ static void usage(void)
 
 int main(int argc, const char **argv)
 {
-  int ret = 0;
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
@@ -83,6 +81,7 @@ int main(int argc, const char **argv)
      return 1;
   }
 
+  int ret = 0;
   librados::ObjectWriteOperation o;
   IoCtx ioctx;
   if (rados.pool_lookup(pool_name.c_str()) <= 0) {

diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc
index 2238c8097bb82860289b7655fc7d2f25df40882b..73767663916c21a06197d2bce86accd251185634 100644 (file)
--- a/src/test/test_rgw_admin_log.cc
+++ b/src/test/test_rgw_admin_log.cc
@@ -1560,8 +1560,7 @@ TEST(TestRGWAdmin, bilog_trim) {
 }
 
 int main(int argc, char *argv[]){
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/test_rgw_admin_meta.cc b/src/test/test_rgw_admin_meta.cc
index 7dc96b61ca1d8dbdb5eb737463d3ac040a1d063a..734836782e09ef5ca331c435f0593a13a31525be 100644 (file)
--- a/src/test/test_rgw_admin_meta.cc
+++ b/src/test/test_rgw_admin_meta.cc
@@ -894,8 +894,7 @@ TEST(TestRGWAdmin, meta_delete){
 }
 
 int main(int argc, char *argv[]){
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/test_rgw_ldap.cc b/src/test/test_rgw_ldap.cc
index 0369c933909ad8fd2f9b81dfe2bf5a4f255fdaa7..007f7db301f54f1d9979a646b0dfab16dfac11fd 100644 (file)
--- a/src/test/test_rgw_ldap.cc
+++ b/src/test/test_rgw_ldap.cc
@@ -86,12 +86,10 @@ TEST(RGW_LDAP, SHUTDOWN) {
 
 int main(int argc, char *argv[])
 {
-  string val;
-  vector<const char*> args;
-
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
+  string val;
   for (auto arg_iter = args.begin(); arg_iter != args.end();) {
     if (ceph_argparse_witharg(args, arg_iter, &val, "--access",
                              (char*) nullptr)) {

diff --git a/src/test/test_rgw_token.cc b/src/test/test_rgw_token.cc
index 321e26fcc9c17e850eef877bcd5419bd652b0336..f2defbf305158d373d3737fa68c5720a6370cf9c 100644 (file)
--- a/src/test/test_rgw_token.cc
+++ b/src/test/test_rgw_token.cc
@@ -106,12 +106,10 @@ TEST(TOKEN, SHUTDOWN) {
 
 int main(int argc, char *argv[])
 {
-  string val;
-  vector<const char*> args;
-
-  argv_to_vec(argc, const_cast<const char**>(argv), args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
+  string val;
   for (auto arg_iter = args.begin(); arg_iter != args.end();) {
     if (ceph_argparse_flag(args, arg_iter, "--verbose",
                              (char*) nullptr)) {

diff --git a/src/test/test_trans.cc b/src/test/test_trans.cc
index 98e407927e454abde67c767e91c06275047e5772..2ac4463035d5f153666204434822a9cdb660e87e 100644 (file)
--- a/src/test/test_trans.cc
+++ b/src/test/test_trans.cc
@@ -37,8 +37,7 @@ struct Foo : public Thread {
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/testkeys.cc b/src/test/testkeys.cc
index 3ad794f5edab01608435c0bf6c8fe9ab1a6d0c6d..85d0b56676f6fa91e63791a415212e68893c8a37 100644 (file)
--- a/src/test/testkeys.cc
+++ b/src/test/testkeys.cc
@@ -12,8 +12,7 @@ using namespace std;
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/testmsgr.cc b/src/test/testmsgr.cc
index 3ff2ed7de9cc33b17e1c73fb293dc2d88cd36ceb..ae162a290cc8cacee00196923b2d2c96b2885f98 100644 (file)
--- a/src/test/testmsgr.cc
+++ b/src/test/testmsgr.cc
@@ -69,8 +69,7 @@ private:
 
 int main(int argc, const char **argv, const char *envp[]) {
 
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/xattr_bench.cc b/src/test/xattr_bench.cc
index 7fac235be4916e63fb42efc523468be9c79b63a5..423e6a8c89084430c1f3bd19552d9012d442b483 100644 (file)
--- a/src/test/xattr_bench.cc
+++ b/src/test/xattr_bench.cc
@@ -144,8 +144,7 @@ uint64_t do_run(ObjectStore *store, int attrsize, int numattrs,
 }
 
 int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/ceph-client-debug.cc b/src/tools/ceph-client-debug.cc
index 5e0b4c4390de22d141da42f66f28539a6c0e969b..229162e3bf37c44ab307e1d5efb90b3c6aab9204 100644 (file)
--- a/src/tools/ceph-client-debug.cc
+++ b/src/tools/ceph-client-debug.cc
@@ -84,8 +84,7 @@ int lookup_trace(ceph_mount_info *client, inodeno_t const ino)
 int main(int argc, const char **argv)
 {
   // Argument handling
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/ceph-dencoder/ceph_dencoder.cc b/src/tools/ceph-dencoder/ceph_dencoder.cc
index f8969cb1a895a2c9912f2c5c59e7e014ec9395fd..af039bdf4627ea02c0823c324fe372853ad46f46 100644 (file)
--- a/src/tools/ceph-dencoder/ceph_dencoder.cc
+++ b/src/tools/ceph-dencoder/ceph_dencoder.cc
@@ -100,8 +100,7 @@ int main(int argc, const char **argv)
     }
   }
 
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
 
   Dencoder *den = NULL;

diff --git a/src/tools/ceph_authtool.cc b/src/tools/ceph_authtool.cc
index 8f627fa4bdea8b137da5647fddac6d9876010c2a..bf0bd5523ecf58e57325cfb8204ef3f57d017bc6 100644 (file)
--- a/src/tools/ceph_authtool.cc
+++ b/src/tools/ceph_authtool.cc
@@ -58,9 +58,7 @@ void usage()
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   std::string add_key;
   std::string caps_fn;
   std::string import_keyring;

diff --git a/src/tools/ceph_conf.cc b/src/tools/ceph_conf.cc
index a88e75b425aac75c3cd19d796cce39abfa684cc2..1d1fc1f7725c54cb737c7fb983ee72df54bb312c 100644 (file)
--- a/src/tools/ceph_conf.cc
+++ b/src/tools/ceph_conf.cc
@@ -181,7 +181,6 @@ static void maybe_override_pid(vector<const char*>& args)
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
   deque<std::string> sections;
   bool resolve_search = false;
   std::string action;
@@ -191,7 +190,7 @@ int main(int argc, const char **argv)
   std::map<string,string> filter_key_value;
   std::string dump_format;
 
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   auto orig_args = args;
   auto cct = [&args] {

diff --git a/src/tools/ceph_dedup_tool.cc b/src/tools/ceph_dedup_tool.cc
index 507ff99b8f49915586ce65941c8c73e42cc1d993..2c117529e0ff64d6cfba765f3822ffa56142963e 100644 (file)
--- a/src/tools/ceph_dedup_tool.cc
+++ b/src/tools/ceph_dedup_tool.cc
@@ -876,8 +876,7 @@ out:
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/ceph_kvstore_tool.cc b/src/tools/ceph_kvstore_tool.cc
index 4d32415ad16e179bf301013e72f45b883f8aa6f9..61fe00cc9b42acb01e7bbae96e7cab4b00d24500 100644 (file)
--- a/src/tools/ceph_kvstore_tool.cc
+++ b/src/tools/ceph_kvstore_tool.cc
@@ -56,8 +56,7 @@ void usage(const char *pname)
 
 int main(int argc, const char *argv[])
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/cephfs/cephfs-data-scan.cc b/src/tools/cephfs/cephfs-data-scan.cc
index f8241823f5c28736ac82c2e4e43b250e09d5768e..3e1b75cb6390a475643dca71be6e31d7e114ac87 100644 (file)
--- a/src/tools/cephfs/cephfs-data-scan.cc
+++ b/src/tools/cephfs/cephfs-data-scan.cc
@@ -11,9 +11,7 @@ using namespace std;
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/cephfs/cephfs-journal-tool.cc b/src/tools/cephfs/cephfs-journal-tool.cc
index 1de11209bbdb8153a5e1a7c2d9db27b4eccd3bdf..f95e7e2651264361922b98fae14f254849798f42 100644 (file)
--- a/src/tools/cephfs/cephfs-journal-tool.cc
+++ b/src/tools/cephfs/cephfs-journal-tool.cc
@@ -23,8 +23,7 @@
 
 int main(int argc, const char **argv)
 {
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     std::cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/cephfs/cephfs-meta-injection.cc b/src/tools/cephfs/cephfs-meta-injection.cc
index 5768d38693c4f68c8fd63a22b8e38ad2c646e6bf..48a913469b8315024c2d7b7cdb03b2641d5573d9 100644 (file)
--- a/src/tools/cephfs/cephfs-meta-injection.cc
+++ b/src/tools/cephfs/cephfs-meta-injection.cc
@@ -19,8 +19,7 @@ static string version = "cephfs-meta-injection v1.1";
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/tools/cephfs/cephfs-table-tool.cc b/src/tools/cephfs/cephfs-table-tool.cc
index 120b4b3576baa8575f13658587e1fbaece9e05ef..4b57080d6273d2a8086bcec15a143ad9f01672ed 100644 (file)
--- a/src/tools/cephfs/cephfs-table-tool.cc
+++ b/src/tools/cephfs/cephfs-table-tool.cc
@@ -11,9 +11,7 @@ using namespace std;
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/cephfs_mirror/main.cc b/src/tools/cephfs_mirror/main.cc
index 2e1dd05edc1a5d7825b63988504bf0456e6c93a3..4abb895a007d7ebcb74a9eb8f228dd0f7108a999 100644 (file)
--- a/src/tools/cephfs_mirror/main.cc
+++ b/src/tools/cephfs_mirror/main.cc
@@ -36,8 +36,7 @@ static void handle_signal(int signum) {
 }
 
 int main(int argc, const char **argv) {
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     ::exit(1);
@@ -83,8 +82,7 @@ int main(int argc, const char **argv) {
   register_async_signal_handler_oneshot(SIGINT, handle_signal);
   register_async_signal_handler_oneshot(SIGTERM, handle_signal);
 
-  std::vector<const char*> cmd_args;
-  argv_to_vec(argc, argv, cmd_args);
+  auto cmd_args = argv_to_vec(argc, argv);
 
   Messenger *msgr = Messenger::create_client_messenger(g_ceph_context, "client");
   msgr->set_default_policy(Messenger::Policy::lossy_client(0));

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index 4a064931cda4f05fbdc35043c90b246c64bb88c3..a7a63d1c45ab31bd2e57502eb7f7a1df2801fa2d 100644 (file)
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -376,8 +376,7 @@ int do_move_item(CephContext* cct,
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/erasure-code/ceph-erasure-code-tool.cc b/src/tools/erasure-code/ceph-erasure-code-tool.cc
index 9c1a459c533acb814ad300fbeaaea5f2ae37d4d9..39f16a8cbbcc4bfbc1d2ea645cec7bcdb95f50f3 100644 (file)
--- a/src/tools/erasure-code/ceph-erasure-code-tool.cc
+++ b/src/tools/erasure-code/ceph-erasure-code-tool.cc
@@ -287,8 +287,7 @@ int do_decode(const std::vector<const char*> &args) {
 }
 
 int main(int argc, const char **argv) {
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,
                          CINIT_FLAG_NO_MON_CONFIG);

diff --git a/src/tools/immutable_object_cache/main.cc b/src/tools/immutable_object_cache/main.cc
index 55b0d087af7c20b474f91f6f032017de8f3bf0e5..085e9d88485e25dbc35b126b39115a93e3c8736a 100644 (file)
--- a/src/tools/immutable_object_cache/main.cc
+++ b/src/tools/immutable_object_cache/main.cc
@@ -31,9 +31,8 @@ static void handle_signal(int signum) {
 }
 
 int main(int argc, const char **argv) {
-  std::vector<const char*> args;
+  auto args = argv_to_vec(argc, argv);
   env_to_vec(args);
-  argv_to_vec(argc, argv, args);
 
   if (ceph_argparse_need_usage(args)) {
     usage();
@@ -56,8 +55,8 @@ int main(int argc, const char **argv) {
   register_async_signal_handler_oneshot(SIGINT, handle_signal);
   register_async_signal_handler_oneshot(SIGTERM, handle_signal);
 
-  std::vector<const char*> cmd_args;
-  argv_to_vec(argc, argv, cmd_args);
+  auto cmd_args = argv_to_vec(argc, argv);
+
 
   cachectl = new ceph::immutable_obj_cache::CacheController(g_ceph_context,
                                                             cmd_args);

diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc
index ae8fccf53921c2e826ae2582ae8ee9d85ea93a05..d566313b17e5d6a8436833c133b5226f3efdc846 100644 (file)
--- a/src/tools/monmaptool.cc
+++ b/src/tools/monmaptool.cc
@@ -182,8 +182,7 @@ bool handle_features(list<feature_op_t>& lst, MonMap &m)
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc
index 0cbaffcd1a6c0aa66c0e7df4982812abedd441cd..e8bf48fbbbfd1d4bfaa16436ae5f5aa932813c11 100644 (file)
--- a/src/tools/osdmaptool.cc
+++ b/src/tools/osdmaptool.cc
@@ -103,8 +103,7 @@ void print_inc_upmaps(const OSDMap::Incremental& pending_inc, int fd)
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 6cb1d0d180ed4638eb11f05338efe827566e424e..23c2a732d64426196f622ecdd2356672cb53f4cd 100644 (file)
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -4047,8 +4047,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
 
 int main(int argc, const char **argv)
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);

diff --git a/src/tools/rbd/Shell.cc b/src/tools/rbd/Shell.cc
index 5df7b1380fc7f7bf05c57d4da9ffd92e026db243..c7d07657403b128923ba89244db627b1dd9bd391 100644 (file)
--- a/src/tools/rbd/Shell.cc
+++ b/src/tools/rbd/Shell.cc
@@ -28,8 +28,7 @@ static const std::string BASH_COMPLETION_SPEC("bash-completion");
 boost::intrusive_ptr<CephContext> global_init(
     int argc, const char **argv, std::vector<std::string> *command_args,
     std::vector<std::string> *global_init_args) {
-  std::vector<const char*> cmd_args;
-  argv_to_vec(argc, argv, cmd_args);
+  auto cmd_args = argv_to_vec(argc, argv);
   std::vector<const char*> args(cmd_args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,

diff --git a/src/tools/rbd_ggate/main.cc b/src/tools/rbd_ggate/main.cc
index 5ed582fbf81c5d745532dd684eb7828558b54237..0942f5689eaae2218cf074f53ccf54c4cbbefb4b 100644 (file)
--- a/src/tools/rbd_ggate/main.cc
+++ b/src/tools/rbd_ggate/main.cc
@@ -87,9 +87,7 @@ static int do_map(int argc, const char *argv[])
 
   Preforker forker;
 
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_DAEMON,
                          CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS);
@@ -402,9 +400,7 @@ int main(int argc, const char *argv[]) {
     List
   } cmd = None;
 
-  vector<const char*> args;
-
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);
@@ -418,9 +414,8 @@ int main(int argc, const char *argv[]) {
 
   std::string format;
   bool pretty_format = false;
-  std::vector<const char*>::iterator i;
 
-  for (i = args.begin(); i != args.end(); ) {
+  for (auto i = args.begin(); i != args.end(); ) {
     if (ceph_argparse_flag(args, i, "-h", "--help", (char*)NULL)) {
       usage();
       return 0;

diff --git a/src/tools/rbd_mirror/main.cc b/src/tools/rbd_mirror/main.cc
index 78f3a5c2eb6caab865dfad9756cc4d93e4bff5d9..e0b9def1e895bab2235128f4fab15d63db642549 100644 (file)
--- a/src/tools/rbd_mirror/main.cc
+++ b/src/tools/rbd_mirror/main.cc
@@ -34,8 +34,7 @@ static void handle_signal(int signum)
 
 int main(int argc, const char **argv)
 {
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     std::cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);
@@ -60,8 +59,7 @@ int main(int argc, const char **argv)
   register_async_signal_handler_oneshot(SIGINT, handle_signal);
   register_async_signal_handler_oneshot(SIGTERM, handle_signal);
 
-  std::vector<const char*> cmd_args;
-  argv_to_vec(argc, argv, cmd_args);
+  auto cmd_args = argv_to_vec(argc, argv);
 
   // disable unnecessary librbd cache
   g_ceph_context->_conf.set_val_or_die("rbd_cache", "false");

diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index 28686842873f75bb4613db63abdee513932f899a..60642edc11c79e40836a34541fe33c798ed6e8a3 100644 (file)
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -1566,8 +1566,7 @@ static int do_map(int argc, const char *argv[], Config *cfg, bool reconnect)
   Preforker forker;
   NBDServer *server;
 
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
     cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);
@@ -2152,9 +2151,7 @@ static int rbd_nbd(int argc, const char *argv[])
 {
   int r;
   Config cfg;
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
-
+  auto args = argv_to_vec(argc, argv);
   std::ostringstream err_msg;
   r = parse_args(args, &err_msg, &cfg);
   if (r == HELP_INFO) {

diff --git a/src/tools/rbd_wnbd/rbd_wnbd.cc b/src/tools/rbd_wnbd/rbd_wnbd.cc
index 0c11c28fe28d0424a9f721e14b8c045f353e1c83..0c5dc9990869105bf96ef63b7e3af8378b3b3005 100644 (file)
--- a/src/tools/rbd_wnbd/rbd_wnbd.cc
+++ b/src/tools/rbd_wnbd/rbd_wnbd.cc
@@ -998,8 +998,7 @@ int construct_devpath_if_missing(Config* cfg)
 boost::intrusive_ptr<CephContext> do_global_init(
   int argc, const char *argv[], Config *cfg)
 {
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   code_environment_t code_env;
   int flags;
@@ -1593,10 +1592,8 @@ static int parse_args(std::vector<const char*>& args,
 
 static int rbd_wnbd(int argc, const char *argv[])
 {
-  int r;
   Config cfg;
-  std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
+  auto args = argv_to_vec(argc, argv);
 
   // Avoid using dout before calling "do_global_init"
   if (args.empty()) {
@@ -1605,7 +1602,7 @@ static int rbd_wnbd(int argc, const char *argv[])
   }
 
   std::ostringstream err_msg;
-  r = parse_args(args, &err_msg, &cmd, &cfg);
+  int r = parse_args(args, &err_msg, &cmd, &cfg);
   if (r == HELP_INFO) {
     usage();
     return 0;