From 004357a03b7e6afce46ac1ef53e6d691f8b2def4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 13 Nov 2017 09:22:32 -0600 Subject: [PATCH] common: don't pass alt_def_args if we don't use them Signed-off-by: Sage Weil --- src/test/erasure-code/ceph_erasure_code.cc | 4 ++-- src/test/erasure-code/ceph_erasure_code_benchmark.cc | 4 ++-- src/test/erasure-code/ceph_erasure_code_non_regression.cc | 4 ++-- src/test/mon/test_mon_workloadgen.cc | 3 +-- src/test/objectstore/test_idempotent_sequence.cc | 3 +-- src/tools/ceph_monstore_tool.cc | 4 ++-- src/tools/ceph_osdomap_tool.cc | 4 ++-- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/test/erasure-code/ceph_erasure_code.cc b/src/test/erasure-code/ceph_erasure_code.cc index 249362fec5a..98982c9214e 100644 --- a/src/test/erasure-code/ceph_erasure_code.cc +++ b/src/test/erasure-code/ceph_erasure_code.cc @@ -73,7 +73,7 @@ int ErasureCodeCommand::setup(int argc, char** argv) { vm); po::notify(vm); - vector ceph_options, def_args; + vector ceph_options; vector ceph_option_strings = po::collect_unrecognized( parsed.options, po::include_positional); ceph_options.reserve(ceph_option_strings.size()); @@ -84,7 +84,7 @@ int ErasureCodeCommand::setup(int argc, char** argv) { } cct = global_init( - &def_args, ceph_options, CEPH_ENTITY_TYPE_CLIENT, + NULL, ceph_options, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); diff --git a/src/test/erasure-code/ceph_erasure_code_benchmark.cc b/src/test/erasure-code/ceph_erasure_code_benchmark.cc index fcaa16b5116..edb921c2081 100644 --- a/src/test/erasure-code/ceph_erasure_code_benchmark.cc +++ b/src/test/erasure-code/ceph_erasure_code_benchmark.cc @@ -71,7 +71,7 @@ int ErasureCodeBench::setup(int argc, char** argv) { vm); po::notify(vm); - vector ceph_options, def_args; + vector ceph_options; vector ceph_option_strings = po::collect_unrecognized( parsed.options, po::include_positional); ceph_options.reserve(ceph_option_strings.size()); @@ -82,7 +82,7 @@ int ErasureCodeBench::setup(int argc, char** argv) { } cct = global_init( - &def_args, ceph_options, CEPH_ENTITY_TYPE_CLIENT, + NULL, ceph_options, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); diff --git a/src/test/erasure-code/ceph_erasure_code_non_regression.cc b/src/test/erasure-code/ceph_erasure_code_non_regression.cc index 6f5071394ea..b21b539d5bd 100644 --- a/src/test/erasure-code/ceph_erasure_code_non_regression.cc +++ b/src/test/erasure-code/ceph_erasure_code_non_regression.cc @@ -81,7 +81,7 @@ int ErasureCodeNonRegression::setup(int argc, char** argv) { vm); po::notify(vm); - vector ceph_options, def_args; + vector ceph_options; vector ceph_option_strings = po::collect_unrecognized( parsed.options, po::include_positional); ceph_options.reserve(ceph_option_strings.size()); @@ -91,7 +91,7 @@ int ErasureCodeNonRegression::setup(int argc, char** argv) { ceph_options.push_back(i->c_str()); } - cct = global_init(&def_args, ceph_options, CEPH_ENTITY_TYPE_CLIENT, + cct = global_init(NULL, ceph_options, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc index 5f2f80f8ede..3f6d05546f6 100644 --- a/src/test/mon/test_mon_workloadgen.cc +++ b/src/test/mon/test_mon_workloadgen.cc @@ -995,12 +995,11 @@ int get_id_interval(int &first, int &last, string &str) int main(int argc, const char *argv[]) { - vector def_args; vector args; our_name = argv[0]; argv_to_vec(argc, argv, args); - auto cct = global_init(&def_args, args, + auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_OSD, CODE_ENVIRONMENT_UTILITY, 0); diff --git a/src/test/objectstore/test_idempotent_sequence.cc b/src/test/objectstore/test_idempotent_sequence.cc index f168a62959d..09514ca30ac 100644 --- a/src/test/objectstore/test_idempotent_sequence.cc +++ b/src/test/objectstore/test_idempotent_sequence.cc @@ -210,12 +210,11 @@ int run_command(std::string& command, std::vector& args) int main(int argc, const char *argv[]) { - vector def_args; vector args; our_name = argv[0]; argv_to_vec(argc, argv, args); - auto cct = global_init(&def_args, args, + 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/tools/ceph_monstore_tool.cc b/src/tools/ceph_monstore_tool.cc index 672e4a564e8..11abe8da21c 100644 --- a/src/tools/ceph_monstore_tool.cc +++ b/src/tools/ceph_monstore_tool.cc @@ -827,7 +827,7 @@ int main(int argc, char **argv) { return 1; } - vector ceph_options, def_args; + vector ceph_options; ceph_options.reserve(ceph_option_strings.size()); for (vector::iterator i = ceph_option_strings.begin(); i != ceph_option_strings.end(); @@ -836,7 +836,7 @@ int main(int argc, char **argv) { } auto cct = global_init( - &def_args, ceph_options, CEPH_ENTITY_TYPE_MON, + NULL, ceph_options, CEPH_ENTITY_TYPE_MON, CODE_ENVIRONMENT_UTILITY, 0); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); diff --git a/src/tools/ceph_osdomap_tool.cc b/src/tools/ceph_osdomap_tool.cc index 8fbff233351..b6b59c26ea3 100644 --- a/src/tools/ceph_osdomap_tool.cc +++ b/src/tools/ceph_osdomap_tool.cc @@ -60,7 +60,7 @@ int main(int argc, char **argv) { return 1; } - vector ceph_options, def_args; + vector ceph_options; ceph_options.reserve(ceph_option_strings.size()); for (vector::iterator i = ceph_option_strings.begin(); i != ceph_option_strings.end(); @@ -71,7 +71,7 @@ int main(int argc, char **argv) { if (vm.count("debug")) debug = true; auto cct = global_init( - &def_args, ceph_options, CEPH_ENTITY_TYPE_OSD, + NULL, ceph_options, CEPH_ENTITY_TYPE_OSD, CODE_ENVIRONMENT_UTILITY_NODOUT, 0); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); -- 2.39.5