From: PCzhangPC <pengcheng.zhang@easystack.cn>
Date: Wed, 23 Aug 2017 10:11:53 +0000 (+0800)
Subject: rbd:rm unnecessary conversion from string to char* in image-meta function
X-Git-Tag: v13.0.0~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17184%2Fhead;p=ceph.git

rbd:rm unnecessary conversion from string to char* in image-meta function

the APIs in librbd receive string type as parameter, so there is no need to convert string to char* in image-meta function

Signed-off-by: PCzhangPC <pengcheng.zhang@easystack.cn>
---

diff --git a/src/tools/rbd/action/ImageMeta.cc b/src/tools/rbd/action/ImageMeta.cc
index d6dec85f6a99..a6f6403c8de3 100644
--- a/src/tools/rbd/action/ImageMeta.cc
+++ b/src/tools/rbd/action/ImageMeta.cc
@@ -83,8 +83,8 @@ static int do_metadata_list(librbd::Image& image, Formatter *f)
   return 0;
 }
 
-static int do_metadata_set(librbd::Image& image, const char *key,
-                          const char *value)
+static int do_metadata_set(librbd::Image& image, std::string &key,
+                          std::string &value)
 {
   int r = image.metadata_set(key, value);
   if (r < 0) {
@@ -94,7 +94,7 @@ static int do_metadata_set(librbd::Image& image, const char *key,
   return r;
 }
 
-static int do_metadata_remove(librbd::Image& image, const char *key)
+static int do_metadata_remove(librbd::Image& image, std::string &key)
 {
   int r = image.metadata_remove(key);
   if (r == -ENOENT) {
@@ -107,7 +107,7 @@ static int do_metadata_remove(librbd::Image& image, const char *key)
   return r;
 }
 
-static int do_metadata_get(librbd::Image& image, const char *key)
+static int do_metadata_get(librbd::Image& image, std::string &key)
 {
   std::string s;
   int r = image.metadata_get(key, &s);
@@ -195,7 +195,7 @@ int execute_get(const po::variables_map &vm) {
     return r;
   }
 
-  r = do_metadata_get(image, key.c_str());
+  r = do_metadata_get(image, key);
   if (r < 0) {
     std::cerr << "rbd: getting metadata failed: " << cpp_strerror(r)
               << std::endl;
@@ -245,7 +245,7 @@ int execute_set(const po::variables_map &vm) {
     return r;
   }
 
-  r = do_metadata_set(image, key.c_str(), value.c_str());
+  r = do_metadata_set(image, key, value);
   if (r < 0) {
     std::cerr << "rbd: setting metadata failed: " << cpp_strerror(r)
               << std::endl;
@@ -287,7 +287,7 @@ int execute_remove(const po::variables_map &vm) {
     return r;
   }
 
-  r = do_metadata_remove(image, key.c_str());
+  r = do_metadata_remove(image, key);
   if (r < 0) {
     std::cerr << "rbd: removing metadata failed: " << cpp_strerror(r)
               << std::endl;