From: lihongjie <lihongjie@cmss.chinamobile.com>
Date: Thu, 9 Mar 2017 10:12:16 +0000 (+0800)
Subject: rgw: remove redundant codes in rgw_cache.h
X-Git-Tag: v12.0.1~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7ef6e03f498dfb647db929487260ec5f9c4ff2a5;p=ceph.git

rgw: remove redundant codes in rgw_cache.h

Signed-off-by: lihongjie <lihongjie@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h
index 583bdc8c76c6..27d4a5de137c 100644
--- a/src/rgw/rgw_cache.h
+++ b/src/rgw/rgw_cache.h
@@ -181,12 +181,10 @@ class RGWCache  : public T
   }
 
   string normal_name(rgw_pool& pool, const std::string& oid) {
-    string& pool_name = pool.name;
-    char buf[pool_name.size() + 1 + oid.size() + 1];
-    const char *pool_str = pool_name.c_str();
-    const char *oid_str = oid.c_str();
-    sprintf(buf, "%s+%s", pool_str, oid_str);
-    return string(buf);
+    std::string buf;
+    buf.reserve(pool.name.size() + oid.size() + 2);
+    buf.append(pool.name).append("+").append(oid);
+    return buf;
   }
 
   void normalize_pool_and_obj(rgw_pool& src_pool, const string& src_obj, rgw_pool& dst_pool, string& dst_obj);