]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
public_access: reuse formatter->dump_bool
authorAbhishek Lekshmanan <abhishek@suse.com>
Wed, 16 Oct 2019 10:01:56 +0000 (12:01 +0200)
committerAbhishek Lekshmanan <abhishek@suse.com>
Mon, 3 Feb 2020 16:53:34 +0000 (17:53 +0100)
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
src/rgw/rgw_public_access.cc

index 18dd878a9116d729d3c0516fa36ea8baa8a759b3..c36f779d220aef80516e699cce9300c5b82f269c 100644 (file)
@@ -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);
 }