From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Wed, 16 Oct 2019 10:01:56 +0000 (+0200)
Subject: public_access: reuse formatter->dump_bool
X-Git-Tag: v15.1.1~555^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=451b18e08f98203044acf55d195098f573fdd926;p=ceph.git

public_access: reuse formatter->dump_bool

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/rgw/rgw_public_access.cc b/src/rgw/rgw_public_access.cc
index 18dd878a9116..c36f779d220a 100644
--- a/src/rgw/rgw_public_access.cc
+++ b/src/rgw/rgw_public_access.cc
@@ -8,7 +8,6 @@ void PublicAccessConfiguration::decode_xml(XMLObj *obj) {
   RGWXMLDecoder::decode_xml("IgnorePublicAcls", IgnorePublicAcls, obj);
   RGWXMLDecoder::decode_xml("BlockPublicPolicy", BlockPublicPolicy, obj);
   RGWXMLDecoder::decode_xml("RestrictPublicBuckets", RestrictPublicBuckets, obj);
-  //  RGWXMLDecoder::decode_xml("BlockPublicAccessConfiguration", this, obj);
 }
 
 void PublicAccessConfiguration::dump_xml(Formatter *f) const {
@@ -18,10 +17,10 @@ void PublicAccessConfiguration::dump_xml(Formatter *f) const {
   // manually encode here
   auto bool_val = [](bool b) -> auto { return b ? "true": "false"; };
 
-  f->dump_string("BlockPublicAcls", bool_val(BlockPublicAcls));
-  f->dump_string("IgnorePublicAcls", bool_val(IgnorePublicAcls));
-  f->dump_string("BlockPublicPolicy", bool_val(BlockPublicPolicy));
-  f->dump_string("RestrictPublicBuckets", bool_val(RestrictPublicBuckets));
+  f->dump_bool("BlockPublicAcls", BlockPublicAcls);
+  f->dump_bool("IgnorePublicAcls", IgnorePublicAcls);
+  f->dump_bool("BlockPublicPolicy", BlockPublicPolicy);
+  f->dump_bool("RestrictPublicBuckets", RestrictPublicBuckets);
 }