From: Colin Patrick McCabe Date: Mon, 28 Mar 2011 23:10:33 +0000 (-0700) Subject: common: rename old argument parsing macros X-Git-Tag: v0.27~235 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ddcd64150edf3ebb6dfb53fa828328d07503ede5;p=ceph.git common: rename old argument parsing macros Signed-off-by: Colin McCabe --- diff --git a/src/cauthtool.cc b/src/cauthtool.cc index c49528153c16..4c1e7ec7dd93 100644 --- a/src/cauthtool.cc +++ b/src/cauthtool.cc @@ -74,32 +74,32 @@ int main(int argc, const char **argv) bool bin_keyring = false; FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("gen-key", 'g')) { - CONF_SAFE_SET_ARG_VAL(&gen_key, OPT_BOOL); - } else if (CONF_ARG_EQ("gen-print-key", '\0')) { - CONF_SAFE_SET_ARG_VAL(&gen_print_key, OPT_BOOL); - } else if (CONF_ARG_EQ("add-key", 'a')) { - CONF_SAFE_SET_ARG_VAL(&add_key, OPT_STR); - } else if (CONF_ARG_EQ("list", 'l')) { - CONF_SAFE_SET_ARG_VAL(&list, OPT_BOOL); - } else if (CONF_ARG_EQ("caps", '\0')) { - CONF_SAFE_SET_ARG_VAL(&caps_fn, OPT_STR); - } else if (CONF_ARG_EQ("cap", '\0')) { + if (CEPH_ARGPARSE_EQ("gen-key", 'g')) { + CEPH_ARGPARSE_SET_ARG_VAL(&gen_key, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("gen-print-key", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&gen_print_key, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("add-key", 'a')) { + CEPH_ARGPARSE_SET_ARG_VAL(&add_key, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("list", 'l')) { + CEPH_ARGPARSE_SET_ARG_VAL(&list, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("caps", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&caps_fn, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("cap", '\0')) { const char *key, *val; - CONF_SAFE_SET_ARG_VAL(&key, OPT_STR); - CONF_SAFE_SET_ARG_VAL(&val, OPT_STR); + CEPH_ARGPARSE_SET_ARG_VAL(&key, OPT_STR); + CEPH_ARGPARSE_SET_ARG_VAL(&val, OPT_STR); ::encode(val, caps[key]); - } else if (CONF_ARG_EQ("print-key", 'p')) { - CONF_SAFE_SET_ARG_VAL(&print_key, OPT_BOOL); - } else if (CONF_ARG_EQ("create-keyring", '\0')) { - CONF_SAFE_SET_ARG_VAL(&create_keyring, OPT_BOOL); - } else if (CONF_ARG_EQ("import-keyring", '\0')) { - CONF_SAFE_SET_ARG_VAL(&import_keyring, OPT_STR); - } else if (CONF_ARG_EQ("set-uid", 'u')) { - CONF_SAFE_SET_ARG_VAL(&auid, OPT_LONGLONG); + } else if (CEPH_ARGPARSE_EQ("print-key", 'p')) { + CEPH_ARGPARSE_SET_ARG_VAL(&print_key, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("create-keyring", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&create_keyring, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("import-keyring", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&import_keyring, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("set-uid", 'u')) { + CEPH_ARGPARSE_SET_ARG_VAL(&auid, OPT_LONGLONG); set_auid = true; - } else if (CONF_ARG_EQ("bin", 'b')) { - CONF_SAFE_SET_ARG_VAL(&bin_keyring, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("bin", 'b')) { + CEPH_ARGPARSE_SET_ARG_VAL(&bin_keyring, OPT_BOOL); } else if (!fn) { fn = args[i]; } else diff --git a/src/cconf.cc b/src/cconf.cc index 7b8a18b1e1ca..ee5901a5469b 100644 --- a/src/cconf.cc +++ b/src/cconf.cc @@ -128,17 +128,17 @@ int main(int argc, const char **argv) env_to_vec(args); FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("section", 's')) { - CONF_SAFE_SET_ARG_VAL(§ion, OPT_STR); + if (CEPH_ARGPARSE_EQ("section", 's')) { + CEPH_ARGPARSE_SET_ARG_VAL(§ion, OPT_STR); sections.push_back(section); - } else if (CONF_ARG_EQ("resolve-search", 'r')) { - CONF_SAFE_SET_ARG_VAL(&resolve_search, OPT_BOOL); - } else if (CONF_ARG_EQ("help", 'h')) { - CONF_SAFE_SET_ARG_VAL(&do_help, OPT_BOOL); - } else if (CONF_ARG_EQ("list-sections", 'l')) { - CONF_SAFE_SET_ARG_VAL(&do_list, OPT_BOOL); - } else if (CONF_ARG_EQ("lookup", '\0')) { - CONF_SAFE_SET_ARG_VAL(&do_lookup, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("resolve-search", 'r')) { + CEPH_ARGPARSE_SET_ARG_VAL(&resolve_search, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("help", 'h')) { + CEPH_ARGPARSE_SET_ARG_VAL(&do_help, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("list-sections", 'l')) { + CEPH_ARGPARSE_SET_ARG_VAL(&do_list, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("lookup", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&do_lookup, OPT_BOOL); } else { nargs.push_back(args[i]); diff --git a/src/cfuse.cc b/src/cfuse.cc index 100cbf333a33..3c53bf04c54d 100644 --- a/src/cfuse.cc +++ b/src/cfuse.cc @@ -59,7 +59,7 @@ int main(int argc, const char **argv, const char *envp[]) { vector nargs; FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("localize-reads", '\0')) { + if (CEPH_ARGPARSE_EQ("localize-reads", '\0')) { cerr << "setting CEPH_OSD_FLAG_LOCALIZE_READS" << std::endl; filer_flags |= CEPH_OSD_FLAG_LOCALIZE_READS; } diff --git a/src/cmds.cc b/src/cmds.cc index 459613a64673..aa55e052254e 100644 --- a/src/cmds.cc +++ b/src/cmds.cc @@ -74,15 +74,15 @@ int main(int argc, const char **argv) const char *dump_file = NULL; int reset_journal = -1; FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("dump-journal", '\0')) { - CONF_SAFE_SET_ARG_VAL(&dump_journal, OPT_INT); - CONF_SAFE_SET_ARG_VAL(&dump_file, OPT_STR); + if (CEPH_ARGPARSE_EQ("dump-journal", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&dump_journal, OPT_INT); + CEPH_ARGPARSE_SET_ARG_VAL(&dump_file, OPT_STR); dout(0) << "dumping journal for mds" << dump_journal << " to " << dump_file << dendl; - } else if (CONF_ARG_EQ("reset-journal", '\0')) { - CONF_SAFE_SET_ARG_VAL(&reset_journal, OPT_INT); - } else if (CONF_ARG_EQ("journal-check", '\0')) { + } else if (CEPH_ARGPARSE_EQ("reset-journal", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&reset_journal, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("journal-check", '\0')) { int check_rank; - CONF_SAFE_SET_ARG_VAL(&check_rank, OPT_INT); + CEPH_ARGPARSE_SET_ARG_VAL(&check_rank, OPT_INT); if (shadow) { dout(0) << "Error: can only select one standby state" << dendl; @@ -92,9 +92,9 @@ int main(int argc, const char **argv) shadow = MDSMap::STATE_ONESHOT_REPLAY; g_conf.mds_standby_for_rank = check_rank; ++i; - } else if (CONF_ARG_EQ("hot-standby", '\0')) { + } else if (CEPH_ARGPARSE_EQ("hot-standby", '\0')) { int check_rank; - CONF_SAFE_SET_ARG_VAL(&check_rank, OPT_INT); + CEPH_ARGPARSE_SET_ARG_VAL(&check_rank, OPT_INT); if (shadow) { dout(0) << "Error: can only select one standby state" << dendl; return -1; @@ -104,7 +104,7 @@ int main(int argc, const char **argv) g_conf.mds_standby_for_rank = check_rank; } else { derr << "unrecognized arg " << args[i] << dendl; - ARGS_USAGE(); + usage(); } } if (g_conf.name->has_default_id() && dump_journal < 0 && reset_journal < 0) { diff --git a/src/cmon.cc b/src/cmon.cc index 96ed18deb7f4..2f54c67154f2 100644 --- a/src/cmon.cc +++ b/src/cmon.cc @@ -65,10 +65,10 @@ int main(int argc, const char **argv) keyring_init(&g_conf); FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("mkfs", '\0')) { + if (CEPH_ARGPARSE_EQ("mkfs", '\0')) { mkfs = true; - } else if (CONF_ARG_EQ("osdmap", '\0')) { - CONF_SAFE_SET_ARG_VAL(&osdmapfn, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("osdmap", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&osdmapfn, OPT_STR); } else usage(); } diff --git a/src/common/ceph_argparse.h b/src/common/ceph_argparse.h index b53a08679165..22e8bacfb464 100644 --- a/src/common/ceph_argparse.h +++ b/src/common/ceph_argparse.h @@ -36,21 +36,16 @@ __isarg = 1 < args.size(); \ for (unsigned i=0; i& args) int optn; for (optn = 0; optn < opt_len; optn++) { - if (CONF_ARG_EQ("lockdep", '\0')) { - CONF_SAFE_SET_ARG_VAL(&g_lockdep, OPT_INT); - } else if (CONF_ARG_EQ(config_optionsp[optn].name, + if (CEPH_ARGPARSE_EQ("lockdep", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&g_lockdep, OPT_INT); + } else if (CEPH_ARGPARSE_EQ(config_optionsp[optn].name, config_optionsp[optn].char_option)) { if (__isarg || val_pos || config_optionsp[optn].type == OPT_BOOL) - CONF_SAFE_SET_ARG_VAL(config_optionsp[optn].val_ptr, config_optionsp[optn].type); + CEPH_ARGPARSE_SET_ARG_VAL(config_optionsp[optn].val_ptr, config_optionsp[optn].type); else continue; } else { diff --git a/src/cosd.cc b/src/cosd.cc index 817d491557e0..c1624115b6cc 100644 --- a/src/cosd.cc +++ b/src/cosd.cc @@ -65,17 +65,17 @@ int main(int argc, const char **argv) bool flushjournal = false; char *dump_pg_log = 0; FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("mkfs", '\0')) { + if (CEPH_ARGPARSE_EQ("mkfs", '\0')) { mkfs = true; - } else if (CONF_ARG_EQ("mkjournal", '\0')) { + } else if (CEPH_ARGPARSE_EQ("mkjournal", '\0')) { mkjournal = true; - } else if (CONF_ARG_EQ("flush-journal", '\0')) { + } else if (CEPH_ARGPARSE_EQ("flush-journal", '\0')) { flushjournal = true; - } else if (CONF_ARG_EQ("dump-pg-log", '\0')) { - CONF_SAFE_SET_ARG_VAL(&dump_pg_log, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("dump-pg-log", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&dump_pg_log, OPT_STR); } else { derr << "unrecognized arg " << args[i] << dendl; - ARGS_USAGE(); + usage(); } } diff --git a/src/crushtool.cc b/src/crushtool.cc index add1c27e0130..e60b623532cb 100644 --- a/src/crushtool.cc +++ b/src/crushtool.cc @@ -797,46 +797,46 @@ int main(int argc, const char **argv) DEFINE_CONF_VARS(usage); FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("clobber", '\0')) { + if (CEPH_ARGPARSE_EQ("clobber", '\0')) { clobber = true; - } else if (CONF_ARG_EQ("decompile", 'd')) { - CONF_SAFE_SET_ARG_VAL(&infn, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("decompile", 'd')) { + CEPH_ARGPARSE_SET_ARG_VAL(&infn, OPT_STR); decompile = true; - } else if (CONF_ARG_EQ("outfn", 'o')) { - CONF_SAFE_SET_ARG_VAL(&outfn, OPT_STR); - } else if (CONF_ARG_EQ("compile", 'c')) { - CONF_SAFE_SET_ARG_VAL(&srcfn, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("outfn", 'o')) { + CEPH_ARGPARSE_SET_ARG_VAL(&outfn, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("compile", 'c')) { + CEPH_ARGPARSE_SET_ARG_VAL(&srcfn, OPT_STR); compile = true; - } else if (CONF_ARG_EQ("test", 't')) { - CONF_SAFE_SET_ARG_VAL(&infn, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("test", 't')) { + CEPH_ARGPARSE_SET_ARG_VAL(&infn, OPT_STR); test = true; - } else if (CONF_ARG_EQ("verbose", 'v')) { + } else if (CEPH_ARGPARSE_EQ("verbose", 'v')) { verbose++; - } else if (CONF_ARG_EQ("build", '\0')) { - CONF_SAFE_SET_ARG_VAL(&build, OPT_BOOL); - } else if (CONF_ARG_EQ("num_osds", '\0')) { - CONF_SAFE_SET_ARG_VAL(&num_osds, OPT_INT); - } else if (CONF_ARG_EQ("num_rep", '\0')) { - CONF_SAFE_SET_ARG_VAL(&num_rep, OPT_INT); - } else if (CONF_ARG_EQ("max_x", '\0')) { - CONF_SAFE_SET_ARG_VAL(&max_x, OPT_INT); - } else if (CONF_ARG_EQ("min_x", '\0')) { - CONF_SAFE_SET_ARG_VAL(&min_x, OPT_INT); - } else if (CONF_ARG_EQ("x", '\0')) { - CONF_SAFE_SET_ARG_VAL(&min_x, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("build", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&build, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("num_osds", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&num_osds, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("num_rep", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&num_rep, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("max_x", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&max_x, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("min_x", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&min_x, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("x", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&min_x, OPT_INT); max_x = min_x; - } else if (CONF_ARG_EQ("max_rule", '\0')) { - CONF_SAFE_SET_ARG_VAL(&max_rule, OPT_INT); - } else if (CONF_ARG_EQ("min_rule", '\0')) { - CONF_SAFE_SET_ARG_VAL(&min_rule, OPT_INT); - } else if (CONF_ARG_EQ("rule", '\0')) { - CONF_SAFE_SET_ARG_VAL(&min_rule, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("max_rule", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&max_rule, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("min_rule", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&min_rule, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("rule", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&min_rule, OPT_INT); max_rule = min_rule; - } else if (CONF_ARG_EQ("weight", 'w')) { + } else if (CEPH_ARGPARSE_EQ("weight", 'w')) { int dev; - CONF_SAFE_SET_ARG_VAL(&dev, OPT_INT); + CEPH_ARGPARSE_SET_ARG_VAL(&dev, OPT_INT); float f; - CONF_SAFE_SET_ARG_VAL(&f, OPT_FLOAT); + CEPH_ARGPARSE_SET_ARG_VAL(&f, OPT_FLOAT); int w = (int)(f * 0x10000); if (w < 0) w = 0; diff --git a/src/monmaptool.cc b/src/monmaptool.cc index 9f126c4b3ccf..fac8b3aca6e7 100644 --- a/src/monmaptool.cc +++ b/src/monmaptool.cc @@ -52,13 +52,13 @@ int main(int argc, const char **argv) common_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("print", '\0')) { - CONF_SAFE_SET_ARG_VAL(&print, OPT_BOOL); - } else if (CONF_ARG_EQ("create", '\0')) { - CONF_SAFE_SET_ARG_VAL(&create, OPT_BOOL); - } else if (CONF_ARG_EQ("clobber", '\0')) { - CONF_SAFE_SET_ARG_VAL(&clobber, OPT_BOOL); - } else if (CONF_ARG_EQ("add", '\0')) { + if (CEPH_ARGPARSE_EQ("print", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&print, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("create", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&create, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("clobber", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&clobber, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("add", '\0')) { if (++i >= args.size()) usage(); string name = args[i]; @@ -71,7 +71,7 @@ int main(int argc, const char **argv) } add[name] = addr; modified = true; - } else if (CONF_ARG_EQ("rm", '\0')) { + } else if (CEPH_ARGPARSE_EQ("rm", '\0')) { if (++i >= args.size()) usage(); string name = args[i]; diff --git a/src/osdmaptool.cc b/src/osdmaptool.cc index 77c49b085e20..33bc284d884b 100644 --- a/src/osdmaptool.cc +++ b/src/osdmaptool.cc @@ -71,33 +71,33 @@ int main(int argc, const char **argv) bool test_crush = false; FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("help", 'h')) { + if (CEPH_ARGPARSE_EQ("help", 'h')) { usage(); - } else if (CONF_ARG_EQ("print", 'p')) { - CONF_SAFE_SET_ARG_VAL(&print, OPT_BOOL); - } else if (CONF_ARG_EQ("createsimple", '\0')) { + } else if (CEPH_ARGPARSE_EQ("print", 'p')) { + CEPH_ARGPARSE_SET_ARG_VAL(&print, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("createsimple", '\0')) { createsimple = true; - CONF_SAFE_SET_ARG_VAL(&num_osd, OPT_INT); - } else if (CONF_ARG_EQ("clobber", '\0')) { - CONF_SAFE_SET_ARG_VAL(&clobber, OPT_BOOL); - } else if (CONF_ARG_EQ("pg_bits", '\0')) { - CONF_SAFE_SET_ARG_VAL(&pg_bits, OPT_INT); - } else if (CONF_ARG_EQ("pgp_bits", '\0')) { - CONF_SAFE_SET_ARG_VAL(&pgp_bits, OPT_INT); - } else if (CONF_ARG_EQ("lpg_bits", '\0')) { - CONF_SAFE_SET_ARG_VAL(&lpg_bits, OPT_INT); - } else if (CONF_ARG_EQ("num_dom", '\0')) { - CONF_SAFE_SET_ARG_VAL(&num_dom, OPT_INT); - } else if (CONF_ARG_EQ("export_crush", '\0')) { - CONF_SAFE_SET_ARG_VAL(&export_crush, OPT_STR); - } else if (CONF_ARG_EQ("import_crush", '\0')) { - CONF_SAFE_SET_ARG_VAL(&import_crush, OPT_STR); - } else if (CONF_ARG_EQ("test_map_pg", '\0')) { - CONF_SAFE_SET_ARG_VAL(&test_map_pg, OPT_STR); - } else if (CONF_ARG_EQ("test_map_object", '\0')) { - CONF_SAFE_SET_ARG_VAL(&test_map_object, OPT_STR); - } else if (CONF_ARG_EQ("test_crush", '\0')) { - CONF_SAFE_SET_ARG_VAL(&test_crush, OPT_BOOL); + CEPH_ARGPARSE_SET_ARG_VAL(&num_osd, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("clobber", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&clobber, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("pg_bits", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&pg_bits, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("pgp_bits", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&pgp_bits, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("lpg_bits", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&lpg_bits, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("num_dom", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&num_dom, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("export_crush", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&export_crush, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("import_crush", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&import_crush, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("test_map_pg", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&test_map_pg, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("test_map_object", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&test_map_object, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("test_crush", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&test_crush, OPT_BOOL); } else if (!fn) fn = args[i]; else diff --git a/src/rados.cc b/src/rados.cc index 525774c0055c..1b3279d6bb30 100644 --- a/src/rados.cc +++ b/src/rados.cc @@ -284,20 +284,20 @@ int main(int argc, const char **argv) bool create_pool = false; FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("pool", 'p')) { - CONF_SAFE_SET_ARG_VAL(&pool_name, OPT_STR); - } else if (CONF_ARG_EQ("snapid", 'S')) { - CONF_SAFE_SET_ARG_VAL(&snapid, OPT_LONGLONG); - } else if (CONF_ARG_EQ("snap", 's')) { - CONF_SAFE_SET_ARG_VAL(&snapname, OPT_STR); - } else if (CONF_ARG_EQ("help", 'h')) { + if (CEPH_ARGPARSE_EQ("pool", 'p')) { + CEPH_ARGPARSE_SET_ARG_VAL(&pool_name, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("snapid", 'S')) { + CEPH_ARGPARSE_SET_ARG_VAL(&snapid, OPT_LONGLONG); + } else if (CEPH_ARGPARSE_EQ("snap", 's')) { + CEPH_ARGPARSE_SET_ARG_VAL(&snapname, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("help", 'h')) { usage(); - } else if (CONF_ARG_EQ("concurrent-ios", 't')) { - CONF_SAFE_SET_ARG_VAL(&concurrent_ios, OPT_INT); - } else if (CONF_ARG_EQ("block-size", 'b')) { - CONF_SAFE_SET_ARG_VAL(&op_size, OPT_INT); - } else if (CONF_ARG_EQ("create-pool", '\0')) { - CONF_SAFE_SET_ARG_VAL(&create_pool, OPT_BOOL); + } else if (CEPH_ARGPARSE_EQ("concurrent-ios", 't')) { + CEPH_ARGPARSE_SET_ARG_VAL(&concurrent_ios, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("block-size", 'b')) { + CEPH_ARGPARSE_SET_ARG_VAL(&op_size, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("create-pool", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&create_pool, OPT_BOOL); } else if (args[i][0] == '-' && nargs.empty()) { cerr << "unrecognized option " << args[i] << std::endl; usage(); diff --git a/src/rbd.cc b/src/rbd.cc index f4e789b21abd..56021a1b50d3 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -591,34 +591,34 @@ int main(int argc, const char **argv) const char *imgname = NULL, *snapname = NULL, *destname = NULL, *dest_poolname = NULL, *path = NULL; bool is_snap_cmd = false; FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("pool", 'p')) { - CONF_SAFE_SET_ARG_VAL(&poolname, OPT_STR); - } else if (CONF_ARG_EQ("dest-pool", '\0')) { - CONF_SAFE_SET_ARG_VAL(&dest_poolname, OPT_STR); - } else if (CONF_ARG_EQ("snap", '\0')) { - CONF_SAFE_SET_ARG_VAL(&snapname, OPT_STR); - } else if (CONF_ARG_EQ("image", 'i')) { - CONF_SAFE_SET_ARG_VAL(&imgname, OPT_STR); - } else if (CONF_ARG_EQ("size", 's')) { - CONF_SAFE_SET_ARG_VAL(&size, OPT_LONGLONG); + if (CEPH_ARGPARSE_EQ("pool", 'p')) { + CEPH_ARGPARSE_SET_ARG_VAL(&poolname, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("dest-pool", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&dest_poolname, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("snap", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&snapname, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("image", 'i')) { + CEPH_ARGPARSE_SET_ARG_VAL(&imgname, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("size", 's')) { + CEPH_ARGPARSE_SET_ARG_VAL(&size, OPT_LONGLONG); size <<= 20; // MB -> bytes - } else if (CONF_ARG_EQ("order", '\0')) { - CONF_SAFE_SET_ARG_VAL(&order, OPT_INT); - } else if (CONF_ARG_EQ("path", '\0')) { - CONF_SAFE_SET_ARG_VAL(&path, OPT_STR); - } else if (CONF_ARG_EQ("dest", '\0')) { - CONF_SAFE_SET_ARG_VAL(&destname, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("order", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&order, OPT_INT); + } else if (CEPH_ARGPARSE_EQ("path", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&path, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("dest", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&destname, OPT_STR); } else { if (!opt_cmd) { - opt_cmd = get_cmd(CONF_VAL, &is_snap_cmd); + opt_cmd = get_cmd(CEPH_ARGPARSE_VAL, &is_snap_cmd); if (opt_cmd < 0) { - cerr << "invalid command: " << CONF_VAL << std::endl; + cerr << "invalid command: " << CEPH_ARGPARSE_VAL << std::endl; usage_exit(); } } else { switch (opt_cmd) { case OPT_LIST: - set_conf_param(CONF_VAL, &poolname, NULL); + set_conf_param(CEPH_ARGPARSE_VAL, &poolname, NULL); break; case OPT_INFO: case OPT_CREATE: @@ -629,17 +629,17 @@ int main(int argc, const char **argv) case OPT_SNAP_REMOVE: case OPT_SNAP_LIST: case OPT_WATCH: - set_conf_param(CONF_VAL, &imgname, NULL); + set_conf_param(CEPH_ARGPARSE_VAL, &imgname, NULL); break; case OPT_EXPORT: - set_conf_param(CONF_VAL, &imgname, &path); + set_conf_param(CEPH_ARGPARSE_VAL, &imgname, &path); break; case OPT_IMPORT: - set_conf_param(CONF_VAL, &path, &destname); + set_conf_param(CEPH_ARGPARSE_VAL, &path, &destname); break; case OPT_COPY: case OPT_RENAME: - set_conf_param(CONF_VAL, &imgname, &destname); + set_conf_param(CEPH_ARGPARSE_VAL, &imgname, &destname); break; } } diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 669bbabb4714..bd6cb8152000 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -188,46 +188,46 @@ int main(int argc, char **argv) bool need_more; FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("uid", 'i')) { - CONF_SAFE_SET_ARG_VAL(&user_id, OPT_STR); - } else if (CONF_ARG_EQ("secret", 's')) { - CONF_SAFE_SET_ARG_VAL(&secret_key, OPT_STR); - } else if (CONF_ARG_EQ("email", 'e')) { - CONF_SAFE_SET_ARG_VAL(&user_email, OPT_STR); - } else if (CONF_ARG_EQ("display-name", 'n')) { - CONF_SAFE_SET_ARG_VAL(&display_name, OPT_STR); - } else if (CONF_ARG_EQ("bucket", 'b')) { - CONF_SAFE_SET_ARG_VAL(&bucket, OPT_STR); - } else if (CONF_ARG_EQ("object", 'o')) { - CONF_SAFE_SET_ARG_VAL(&object, OPT_STR); - } else if (CONF_ARG_EQ("auth-uid", 'a')) { - CONF_SAFE_SET_ARG_VAL(&auid, OPT_LONGLONG); - } else if (CONF_ARG_EQ("os-user", '\0')) { - CONF_SAFE_SET_ARG_VAL(&openstack_user, OPT_STR); - } else if (CONF_ARG_EQ("os-secret", '\0')) { - CONF_SAFE_SET_ARG_VAL(&openstack_key, OPT_STR); - } else if (CONF_ARG_EQ("date", '\0')) { - CONF_SAFE_SET_ARG_VAL(&date, OPT_STR); + if (CEPH_ARGPARSE_EQ("uid", 'i')) { + CEPH_ARGPARSE_SET_ARG_VAL(&user_id, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("secret", 's')) { + CEPH_ARGPARSE_SET_ARG_VAL(&secret_key, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("email", 'e')) { + CEPH_ARGPARSE_SET_ARG_VAL(&user_email, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("display-name", 'n')) { + CEPH_ARGPARSE_SET_ARG_VAL(&display_name, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("bucket", 'b')) { + CEPH_ARGPARSE_SET_ARG_VAL(&bucket, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("object", 'o')) { + CEPH_ARGPARSE_SET_ARG_VAL(&object, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("auth-uid", 'a')) { + CEPH_ARGPARSE_SET_ARG_VAL(&auid, OPT_LONGLONG); + } else if (CEPH_ARGPARSE_EQ("os-user", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&openstack_user, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("os-secret", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&openstack_key, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("date", '\0')) { + CEPH_ARGPARSE_SET_ARG_VAL(&date, OPT_STR); } else { if (!opt_cmd) { - opt_cmd = get_cmd(CONF_VAL, prev_cmd, &need_more); + opt_cmd = get_cmd(CEPH_ARGPARSE_VAL, prev_cmd, &need_more); if (opt_cmd < 0) { cerr << "unrecognized arg " << args[i] << std::endl; - ARGS_USAGE(); + usage(); } if (need_more) { - prev_cmd = CONF_VAL; + prev_cmd = CEPH_ARGPARSE_VAL; continue; } } else { cerr << "unrecognized arg " << args[i] << std::endl; - ARGS_USAGE(); + usage(); } } } if (opt_cmd == OPT_NO_CMD) - ARGS_USAGE(); + usage(); store = RGWAccess::init_storage_provider("rados", &g_conf); if (!store) { @@ -399,7 +399,7 @@ int main(int argc, char **argv) cerr << "date was not specified" << std::endl; if (!bucket) cerr << "bucket was not specified" << std::endl; - ARGS_USAGE(); + usage(); } string log_bucket = RGW_LOG_BUCKET_NAME; diff --git a/src/test/TestSignalHandlers.cc b/src/test/TestSignalHandlers.cc index 2159fabe6d53..71bc8bee4ab5 100644 --- a/src/test/TestSignalHandlers.cc +++ b/src/test/TestSignalHandlers.cc @@ -98,13 +98,13 @@ int main(int argc, const char **argv) DEFINE_CONF_VARS(usage); FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("simple_segv", 's')) { + if (CEPH_ARGPARSE_EQ("simple_segv", 's')) { simple_segv_test(); } - else if (CONF_ARG_EQ("infinite_recursion", 'r')) { + else if (CEPH_ARGPARSE_EQ("infinite_recursion", 'r')) { infinite_recursion_test(); } - else if (CONF_ARG_EQ("help", 'h')) { + else if (CEPH_ARGPARSE_EQ("help", 'h')) { usage(); } } diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc index e024a07f10fc..6bdaa4697b06 100644 --- a/src/tools/ceph.cc +++ b/src/tools/ceph.cc @@ -55,17 +55,17 @@ static void parse_cmd_args(const vector &args, { DEFINE_CONF_VARS(usage); FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("in_file", 'i')) { - CONF_SAFE_SET_ARG_VAL(in_file, OPT_STR); - } else if (CONF_ARG_EQ("concise", '\0')) { + if (CEPH_ARGPARSE_EQ("in_file", 'i')) { + CEPH_ARGPARSE_SET_ARG_VAL(in_file, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("concise", '\0')) { g.concise = true; - } else if (CONF_ARG_EQ("out_file", 'o')) { - CONF_SAFE_SET_ARG_VAL(out_file, OPT_STR); - } else if (CONF_ARG_EQ("status", 's')) { + } else if (CEPH_ARGPARSE_EQ("out_file", 'o')) { + CEPH_ARGPARSE_SET_ARG_VAL(out_file, OPT_STR); + } else if (CEPH_ARGPARSE_EQ("status", 's')) { *mode = CEPH_TOOL_MODE_ONE_SHOT_OBSERVER; - } else if (CONF_ARG_EQ("watch", 'w')) { + } else if (CEPH_ARGPARSE_EQ("watch", 'w')) { *mode = CEPH_TOOL_MODE_OBSERVER; - } else if (CONF_ARG_EQ("help", 'h')) { + } else if (CEPH_ARGPARSE_EQ("help", 'h')) { usage(); } else if (args[i][0] == '-' && nargs->empty()) { derr << "unrecognized option " << args[i] << dendl; diff --git a/src/tools/gceph.cc b/src/tools/gceph.cc index 105de642bfee..63d8d3f31ae0 100644 --- a/src/tools/gceph.cc +++ b/src/tools/gceph.cc @@ -41,7 +41,7 @@ static void parse_gceph_args(const vector &args) { DEFINE_CONF_VARS(usage); FOR_EACH_ARG(args) { - if (CONF_ARG_EQ("help", 'h')) { + if (CEPH_ARGPARSE_EQ("help", 'h')) { usage(); } }