From: baiyanchun Date: Thu, 23 Mar 2017 02:38:15 +0000 (+0800) Subject: common: remove useless parameter X-Git-Tag: v12.0.2~314^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=83803de34780a62ba5ad5d9e91a75708dde82303;p=ceph-ci.git common: remove useless parameter Signed-off-by: baiyanchun --- diff --git a/src/common/ceph_argparse.cc b/src/common/ceph_argparse.cc index df02434c4fb..df68b967ea2 100644 --- a/src/common/ceph_argparse.cc +++ b/src/common/ceph_argparse.cc @@ -457,7 +457,7 @@ bool ceph_argparse_witharg(std::vector &args, } CephInitParameters ceph_argparse_early_args - (std::vector& args, uint32_t module_type, int flags, + (std::vector& args, uint32_t module_type, std::string *cluster, std::string *conf_file_list) { CephInitParameters iparams(module_type); diff --git a/src/common/ceph_argparse.h b/src/common/ceph_argparse.h index b504b3508fb..3cf8b7a032f 100644 --- a/src/common/ceph_argparse.h +++ b/src/common/ceph_argparse.h @@ -68,7 +68,7 @@ bool ceph_argparse_binary_flag(std::vector &args, std::vector::iterator &i, int *ret, std::ostream *oss, ...); extern CephInitParameters ceph_argparse_early_args - (std::vector& args, uint32_t module_type, int flags, + (std::vector& args, uint32_t module_type, std::string *cluster, std::string *conf_file_list); extern void generic_server_usage(); extern void generic_client_usage(); diff --git a/src/global/global_init.cc b/src/global/global_init.cc index 3a905c0b576..8d2f3cca394 100644 --- a/src/global/global_init.cc +++ b/src/global/global_init.cc @@ -83,7 +83,7 @@ void global_pre_init(std::vector < const char * > *alt_def_args, { std::string conf_file_list; std::string cluster = ""; - CephInitParameters iparams = ceph_argparse_early_args(args, module_type, flags, + CephInitParameters iparams = ceph_argparse_early_args(args, module_type, &cluster, &conf_file_list); CephContext *cct = common_preinit(iparams, code_env, flags, data_dir_option); cct->_conf->cluster = cluster;