From: Jeffrey Lu <lzhng2000@hotmail.com>
Date: Thu, 14 Jan 2016 08:47:02 +0000 (+0800)
Subject: cls/cls_rbd: pass string by reference
X-Git-Tag: v10.0.4~194^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0187a59918034540bfa6740c1c1e41b542d2ea2c;p=ceph.git

cls/cls_rbd: pass string by reference

Signed-off-by: Jeffrey Lu <lzhng2000@aliyun.com>
---

diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index 8b88c5eaeda4..36271dab4443 100644
--- a/src/cls/rbd/cls_rbd.cc
+++ b/src/cls/rbd/cls_rbd.cc
@@ -2983,7 +2983,7 @@ int read_peers(cls_method_context_t hctx,
   return 0;
 }
 
-int read_peer(cls_method_context_t hctx, const std::string uuid,
+int read_peer(cls_method_context_t hctx, const std::string &uuid,
               cls::rbd::MirrorPeer *peer) {
   bufferlist bl;
   int r = cls_cxx_map_get_val(hctx, peer_key(uuid), &bl);
@@ -3003,7 +3003,7 @@ int read_peer(cls_method_context_t hctx, const std::string uuid,
   return 0;
 }
 
-int write_peer(cls_method_context_t hctx, const std::string uuid,
+int write_peer(cls_method_context_t hctx, const std::string &uuid,
                const cls::rbd::MirrorPeer &peer) {
   bufferlist bl;
   ::encode(peer, bl);
diff --git a/src/test/librados/test.cc b/src/test/librados/test.cc
index 469b7145bff8..5ba5a68f6311 100644
--- a/src/test/librados/test.cc
+++ b/src/test/librados/test.cc
@@ -104,7 +104,7 @@ int rados_pool_set(
     rados_t *cluster,
     const std::string &pool_name,
     const std::string &var,
-    const std::string val)
+    const std::string &val)
 {
   JSONFormatter cmd_f;
   cmd_f.open_object_section("command");
diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc
index 4f4b2e87824f..13be4147271f 100644
--- a/src/tools/rbd/Utils.cc
+++ b/src/tools/rbd/Utils.cc
@@ -591,7 +591,7 @@ int init_and_open_image(const std::string &pool_name,
   return 0;
 }
 
-int snap_set(librbd::Image &image, const std::string snap_name) {
+int snap_set(librbd::Image &image, const std::string &snap_name) {
   int r = image.snap_set(snap_name.c_str());
   if (r < 0) {
     std::cerr << "error setting snapshot context: " << cpp_strerror(r)
diff --git a/src/tools/rbd/Utils.h b/src/tools/rbd/Utils.h
index 0f290df237db..7caf43d7f16f 100644
--- a/src/tools/rbd/Utils.h
+++ b/src/tools/rbd/Utils.h
@@ -96,7 +96,7 @@ int init_and_open_image(const std::string &pool_name,
                         librados::Rados *rados, librados::IoCtx *io_ctx,
                         librbd::Image *image);
 
-int snap_set(librbd::Image &image, const std::string snap_name);
+int snap_set(librbd::Image &image, const std::string &snap_name);
 
 std::string image_id(librbd::Image& image);
 
diff --git a/src/tools/rbd/action/Kernel.cc b/src/tools/rbd/action/Kernel.cc
index 541da95c8b49..3c552d985eb9 100644
--- a/src/tools/rbd/action/Kernel.cc
+++ b/src/tools/rbd/action/Kernel.cc
@@ -62,12 +62,12 @@ static std::string map_option_int_cb(const char *value_char)
   return stringify(d);
 }
 
-static void put_map_option(const std::string key, std::string val)
+static void put_map_option(const std::string &key, std::string val)
 {
   map_options[key] = val;
 }
 
-static int put_map_option_value(const std::string opt, const char *value_char,
+static int put_map_option_value(const std::string &opt, const char *value_char,
                                 std::string (*parse_cb)(const char *))
 {
   if (!value_char || *value_char == '\0') {