From 065b5358f793e4060a8d843ab6fad93229a29ebf Mon Sep 17 00:00:00 2001 From: Abhishek Lekshmanan Date: Thu, 12 Sep 2019 14:55:17 +0200 Subject: [PATCH] rgw: public_access: rename the getters to reflect what the conf actually does Signed-off-by: Abhishek Lekshmanan --- src/rgw/rgw_public_access.cc | 8 ++++---- src/rgw/rgw_public_access.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/rgw/rgw_public_access.cc b/src/rgw/rgw_public_access.cc index e5131a0f06d..18dd878a911 100644 --- a/src/rgw/rgw_public_access.cc +++ b/src/rgw/rgw_public_access.cc @@ -28,10 +28,10 @@ void PublicAccessConfiguration::dump_xml(Formatter *f) const { ostream& operator<< (ostream& os, const PublicAccessConfiguration& access_conf) { os << std::boolalpha - << "BlockPublicAcls: " << access_conf.get_block_public_acls() << std::endl - << "IgnorePublicAcls: " << access_conf.get_ignore_public_acls() << std::endl - << "BlockPublicPolicy" << access_conf.get_block_public_policy() << std::endl - << "RestrictPublicBuckets" << access_conf.get_restrict_public_buckets() << std::endl; + << "BlockPublicAcls: " << access_conf.block_public_acls() << std::endl + << "IgnorePublicAcls: " << access_conf.ignore_public_acls() << std::endl + << "BlockPublicPolicy" << access_conf.block_public_policy() << std::endl + << "RestrictPublicBuckets" << access_conf.restrict_public_buckets() << std::endl; return os; } diff --git a/src/rgw/rgw_public_access.h b/src/rgw/rgw_public_access.h index b9eb6d5ddee..b509b9be4c5 100644 --- a/src/rgw/rgw_public_access.h +++ b/src/rgw/rgw_public_access.h @@ -31,16 +31,16 @@ class PublicAccessConfiguration { BlockPublicPolicy(true), RestrictPublicBuckets(false) {} - auto get_block_public_acls() const { + auto block_public_acls() const { return BlockPublicAcls; } - auto get_ignore_public_acls() const { + auto ignore_public_acls() const { return IgnorePublicAcls; } - auto get_block_public_policy() const { + auto block_public_policy() const { return BlockPublicPolicy; } - auto get_restrict_public_buckets() const { + auto restrict_public_buckets() const { return RestrictPublicBuckets; } -- 2.39.5