rgw: make encode_key a member of ListBucket

So that it can be reused for other member functions that need to determine if
encoding is necessary

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 0974168b75f3078f62cce89c5ad5194c2945bd69)

Conflicts:
	src/rgw/rgw_rest_s3.cc
- trivial difference in white-space

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 0a28abaeb455606a9df3a4e656ccaa4efa5ffdef..df6547037abbc04d7bf46eb743e598964389c2b9 100644 (file)
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -788,7 +788,6 @@ void RGWListBucket_ObjStore_S3::send_versioned_response()
     }
   }
 
-  bool encode_key = false;
   if (strcasecmp(encoding_type.c_str(), "url") == 0) {
     s->formatter->dump_string("EncodingType", "url");
     encode_key = true;
@@ -900,7 +899,6 @@ void RGWListBucket_ObjStore_S3::send_response()
 
   s->formatter->open_object_section_in_ns("ListBucketResult", XMLNS_AWS_S3);
   RGWListBucket_ObjStore_S3::send_common_response();
-  bool encode_key = false;
   if (strcasecmp(encoding_type.c_str(), "url") == 0) {
     s->formatter->dump_string("EncodingType", "url");
     encode_key = true;
@@ -953,7 +951,6 @@ void RGWListBucket_ObjStore_S3v2::send_versioned_response()
     s->formatter->dump_string("NextVersionIdContinuationToken", next_marker.instance);
   }
 
-  bool encode_key = false;
   if (strcasecmp(encoding_type.c_str(), "url") == 0) {
     s->formatter->dump_string("EncodingType", "url");
     encode_key = true;
@@ -1054,7 +1051,6 @@ void RGWListBucket_ObjStore_S3v2::send_response()
   s->formatter->open_object_section_in_ns("ListBucketResult", XMLNS_AWS_S3);
 
   RGWListBucket_ObjStore_S3::send_common_response();
-  bool encode_key = false;
   if (strcasecmp(encoding_type.c_str(), "url") == 0) {
     s->formatter->dump_string("EncodingType", "url");
     encode_key = true;

diff --git a/src/rgw/rgw_rest_s3.h b/src/rgw/rgw_rest_s3.h
index 1be767dd978339bcdd91ee970cb6c005ad86b870..e659c088061ff5800a02d28d004538dbeb474cb5 100644 (file)
--- a/src/rgw/rgw_rest_s3.h
+++ b/src/rgw/rgw_rest_s3.h
@@ -107,7 +107,9 @@ public:
 };
 
 class RGWListBucket_ObjStore_S3 : public RGWListBucket_ObjStore {
-  protected:  bool objs_container;
+protected:
+  bool objs_container;
+  bool encode_key {false};
   int get_common_params();
   void send_common_response();
   void send_common_versioned_response();