From 6df121443f66214877e36909ececb37c238dbc44 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 4 Feb 2020 16:56:31 +0800 Subject: [PATCH] common/cmdparse: pass cmdmap by const reference Signed-off-by: Kefu Chai --- src/common/cmdparse.cc | 7 +++---- src/common/cmdparse.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/common/cmdparse.cc b/src/common/cmdparse.cc index 1827a138798..d09acd68f0e 100644 --- a/src/common/cmdparse.cc +++ b/src/common/cmdparse.cc @@ -281,15 +281,14 @@ void cmdmap_dump(const cmdmap_t &cmdmap, Formatter *f) * false, ss is valid */ bool -cmdmap_from_json(vector cmd, cmdmap_t *mapp, stringstream &ss) +cmdmap_from_json(const vector& cmd, cmdmap_t *mapp, stringstream &ss) { json_spirit::mValue v; string fullcmd; // First, join all cmd strings - for (vector::iterator it = cmd.begin(); - it != cmd.end(); ++it) - fullcmd += *it; + for (auto& c : cmd) + fullcmd += c; try { if (!json_spirit::read(fullcmd, v)) diff --git a/src/common/cmdparse.h b/src/common/cmdparse.h index d552556e410..424ac812d7d 100644 --- a/src/common/cmdparse.h +++ b/src/common/cmdparse.h @@ -39,7 +39,7 @@ void dump_cmddesc_to_json(ceph::Formatter *jf, const std::string& module, const std::string& perm, uint64_t flags); -bool cmdmap_from_json(std::vector cmd, cmdmap_t *mapp, +bool cmdmap_from_json(const std::vector& cmd, cmdmap_t *mapp, std::stringstream &ss); void cmdmap_dump(const cmdmap_t &cmdmap, ceph::Formatter *f); void handle_bad_get(CephContext *cct, const std::string& k, const char *name); -- 2.39.5