From: Ronen Friedman Date: Thu, 19 Aug 2021 12:55:24 +0000 (+0000) Subject: common: modify 'main()s' to use new argv_to_vec() signature X-Git-Tag: v17.1.0~985^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d4c360a4ab82fd11aee16e7b77fbf2ea560a353;p=ceph.git 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 --- diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc index 01858fccbe4..5b2d370c49d 100644 --- 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 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 0d6c5ed7064..5a917fa807c 100644 --- 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 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 a80eb2f2433..67bda0c51be 100644 --- 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 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 5efcc13575f..4410e0dcb56 100644 --- 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 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 38268c438e8..9e1d6a87861 100644 --- 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 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 92dfa5a3fb3..35c82a2715c 100644 --- a/src/dokan/ceph_dokan.cc +++ b/src/dokan/ceph_dokan.cc @@ -989,8 +989,7 @@ int do_map() { boost::intrusive_ptr do_global_init( int argc, const char **argv, Command cmd) { - std::vector 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 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 63af614bcef..424cbb85a10 100644 --- 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 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 edef71f1b27..a403a4b9762 100644 --- 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 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 4d11f73a0fa..f1ea107518e 100644 --- a/src/log/test.cc +++ b/src/log/test.cc @@ -369,10 +369,9 @@ TEST(Log, GarbleRecovery) int main(int argc, char **argv) { - vector 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 2f13cf31211..d1bfafbd46b 100644 --- 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 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 89f79a13de3..e22010cb452 100644 --- 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 lg(librgw_mtx); if (! g_ceph_context) { - vector args; std::vector 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(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 d69a9e99f6a..9ef12b702c4 100644 --- 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& opt_ int main(int argc, const char **argv) { - vector 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 e503d4a6857..6cfbc935292 100644 --- 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 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 aa3fdd4fc9b..4bb0364c2d4 100644 --- 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 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 19d1ac460b3..e2e82ad58b1 100644 --- 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 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 aaa4f47ca2c..0d58671dbf2 100644 --- 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 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 15ee1f5b36a..061639ad946 100644 --- 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 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 db19c17e8cd..1410b39b056 100644 --- 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 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 a1344e06fae..fb307ed9bdf 100644 --- 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 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 98cb4f927b7..78bdfd3a41b 100644 --- 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 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 e4855521bee..60fda462e87 100644 --- 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 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 b85399774f3..dcd48acbbb2 100644 --- a/src/test/client/main.cc +++ b/src/test/client/main.cc @@ -21,8 +21,7 @@ int main(int argc, char **argv) { - std::vector 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 b83605ec9bf..88bc181912f 100644 --- 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 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 f1e7945fe8e..c9afe54837a 100644 --- 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 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 77093f13e47..311fce161d6 100644 --- 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 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 9ee648aac12..401b8affc71 100644 --- 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 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 8e3c52a19c0..bd387654ff5 100644 --- 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 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 1ae9849e4b2..02bc549e108 100644 --- 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 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 afb535d3111..d0131ae046d 100644 --- 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 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 bc35346e41d..f5de5a9117a 100644 --- 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 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 28ab88e7cb9..40bab659cf3 100644 --- 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 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 12d56e85c69..f92c42c72a5 100644 --- 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 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 b206f24932c..9dc9541acaa 100644 --- 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 args; - - argv_to_vec(argc, const_cast(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 224366b4360..11c81ad7fd4 100644 --- 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 args; - - argv_to_vec(argc, const_cast(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 8bbe350ac24..e0f18022e10 100644 --- 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 args; - - argv_to_vec(argc, const_cast(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 757fdfd8da2..56b61dce4be 100644 --- 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 args; - - argv_to_vec(argc, const_cast(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 3e2bce95e78..9095fd9bfcf 100644 --- 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 args; - - argv_to_vec(argc, const_cast(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 eb48a1ee71c..c1e9c35c58b 100644 --- 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 args; - - argv_to_vec(argc, const_cast(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 73902c4810b..13c75becc2e 100644 --- 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 args; - - argv_to_vec(argc, const_cast(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 4a05876154e..1ec328d1f73 100644 --- 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 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 147ea8bcd04..e62c5627b40 100644 --- 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 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 0e5c5ab367f..20fff879bfd 100644 --- 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 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 f17f90f6d08..aec5923fcbf 100644 --- 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 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 cbcf6cab48d..b164ceb4ad2 100644 --- 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 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 68133224c21..d2af3ab66be 100644 --- 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 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 86039204070..ae36c36e655 100644 --- 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 args; - argv_to_vec(argc, const_cast(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 a2475e31180..4ea0ae5644f 100644 --- 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 args; - argv_to_vec(argc, const_cast(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 414608e0420..e2ce3b2ef08 100644 --- 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 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 c7bf09e7e92..a0db4e153d5 100644 --- 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 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 16133241fd7..fa4fb69e62e 100644 --- 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 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 e5e591a38c4..628b586bc2f 100755 --- 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 args; - argv_to_vec(argc, (const char **)argv, args); - + auto args = argv_to_vec(argc, argv); map defaults = { { "debug_bdev", "1/20" } }; diff --git a/src/test/objectstore/test_bluefs.cc b/src/test/objectstore/test_bluefs.cc index 1de92744868..d868c876e1e 100644 --- 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 args; - argv_to_vec(argc, (const char **)argv, args); - + auto args = argv_to_vec(argc, argv); map 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 e3b14f9c272..c8a62a12527 100644 --- 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 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 267f4e7c96b..a2af4073ee5 100644 --- 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 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 de053859e7a..cac395c36fc 100644 --- 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& args) int main(int argc, const char *argv[]) { - vector 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 1de904adc23..5917f140b10 100644 --- 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 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 2a0ea093f86..507f74d22d2 100644 --- 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 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 da29599cf83..65a2987d08d 100644 --- 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 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::iterator i = args.begin(); while (i != args.end()) { diff --git a/src/test/omap_bench.cc b/src/test/omap_bench.cc index e34387d72ae..714774f12c5 100644 --- 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 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 053af6db22a..c0976fcf1a9 100644 --- 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 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 5623d47f65e..7ee1255ed0f 100644 --- 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 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 f69905017f1..096f9b49ebf 100644 --- 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 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 460411fc0d5..6c733acf9e8 100644 --- 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 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 4a473ed3466..cf5315048f0 100644 --- 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 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 599266731d8..418c6da022c 100644 --- 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 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 edf24f41bb6..bff15deb5d0 100644 --- 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 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 8ccf17c9471..ee92248d008 100644 --- 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 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 39c173ac430..a3589934f44 100644 --- 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 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 a8b12dadd41..5fe1ac2f1fc 100644 --- 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 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 9cb735b5c1a..2df022f80a3 100644 --- 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 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 5a13647e9f1..1ae758bfb34 100644 --- 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 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 356b1932328..f985b2c155a 100644 --- 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 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 4b8c144be23..9dd96682f36 100644 --- 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 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 98841e7cc09..04475f6174d 100644 --- 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 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 2238c8097bb..73767663916 100644 --- 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 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 7dc96b61ca1..734836782e0 100644 --- 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 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 0369c933909..007f7db301f 100644 --- 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 args; - - argv_to_vec(argc, const_cast(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 321e26fcc9c..f2defbf3051 100644 --- 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 args; - - argv_to_vec(argc, const_cast(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 98e407927e4..2ac4463035d 100644 --- 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 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 3ad794f5eda..85d0b56676f 100644 --- 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 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 3ff2ed7de9c..ae162a290cc 100644 --- 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 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 7fac235be49..423e6a8c890 100644 --- 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 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 5e0b4c4390d..229162e3bf3 100644 --- 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 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 f8969cb1a89..af039bdf462 100644 --- 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 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 8f627fa4bde..bf0bd5523ec 100644 --- 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 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 a88e75b425a..1d1fc1f7725 100644 --- a/src/tools/ceph_conf.cc +++ b/src/tools/ceph_conf.cc @@ -181,7 +181,6 @@ static void maybe_override_pid(vector& args) int main(int argc, const char **argv) { - vector args; deque sections; bool resolve_search = false; std::string action; @@ -191,7 +190,7 @@ int main(int argc, const char **argv) std::map 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 507ff99b8f4..2c117529e0f 100644 --- 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 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 4d32415ad16..61fe00cc9b4 100644 --- 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 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 f8241823f5c..3e1b75cb639 100644 --- 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 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 1de11209bbd..f95e7e26512 100644 --- 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 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 5768d38693c..48a913469b8 100644 --- 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 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 120b4b3576b..4b57080d627 100644 --- 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 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 2e1dd05edc1..4abb895a007 100644 --- 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 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 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 4a064931cda..a7a63d1c45a 100644 --- 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 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 9c1a459c533..39f16a8cbbc 100644 --- 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 &args) { } int main(int argc, const char **argv) { - std::vector 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 55b0d087af7..085e9d88485 100644 --- 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 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 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 ae8fccf5392..d566313b17e 100644 --- a/src/tools/monmaptool.cc +++ b/src/tools/monmaptool.cc @@ -182,8 +182,7 @@ bool handle_features(list& lst, MonMap &m) int main(int argc, const char **argv) { - vector 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 0cbaffcd1a6..e8bf48fbbbf 100644 --- 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 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 6cb1d0d180e..23c2a732d64 100644 --- 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 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 5df7b1380fc..c7d07657403 100644 --- 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 global_init( int argc, const char **argv, std::vector *command_args, std::vector *global_init_args) { - std::vector cmd_args; - argv_to_vec(argc, argv, cmd_args); + auto cmd_args = argv_to_vec(argc, argv); std::vector 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 5ed582fbf81..0942f5689ea 100644 --- 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 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 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::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 78f3a5c2eb6..e0b9def1e89 100644 --- 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 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 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 28686842873..60642edc11c 100644 --- 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 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 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 0c11c28fe28..0c5dc999086 100644 --- 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 do_global_init( int argc, const char *argv[], Config *cfg) { - std::vector 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& args, static int rbd_wnbd(int argc, const char *argv[]) { - int r; Config cfg; - std::vector 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;