From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 29 Aug 2017 19:51:56 +0000 (-0400)
Subject: rgw: MetadataManager interface takes const string refs
X-Git-Tag: v12.2.3~125^2~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7308044ac932ada012b22ce9b0ab65ce70d9bec9;p=ceph.git

rgw: MetadataManager interface takes const string refs

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b3a5c5a0569f95a5a755ea0dc03ec2c1ea4bdc4d)
---

diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc
index 6c554810e98a..6a275239c5fc 100644
--- a/src/rgw/rgw_metadata.cc
+++ b/src/rgw/rgw_metadata.cc
@@ -844,12 +844,13 @@ struct list_keys_handle {
   RGWMetadataHandler *handler;
 };
 
-int RGWMetadataManager::list_keys_init(string& section, void **handle)
+int RGWMetadataManager::list_keys_init(const string& section, void **handle)
 {
   return list_keys_init(section, string(), handle);
 }
 
-int RGWMetadataManager::list_keys_init(string& section, const string& marker, void **handle)
+int RGWMetadataManager::list_keys_init(const string& section,
+                                       const string& marker, void **handle)
 {
   string entry;
   RGWMetadataHandler *handler;
diff --git a/src/rgw/rgw_metadata.h b/src/rgw/rgw_metadata.h
index f6dc2db03bc3..0dfc73f112de 100644
--- a/src/rgw/rgw_metadata.h
+++ b/src/rgw/rgw_metadata.h
@@ -353,8 +353,8 @@ public:
           obj_version *existing_version = NULL);
   int remove(string& metadata_key);
 
-  int list_keys_init(string& section, void **phandle);
-  int list_keys_init(string& section, const string& marker, void **phandle);
+  int list_keys_init(const string& section, void **phandle);
+  int list_keys_init(const string& section, const string& marker, void **phandle);
   int list_keys_next(void *handle, int max, list<string>& keys, bool *truncated);
   void list_keys_complete(void *handle);