From: Jos Collin <jcollin@redhat.com>
Date: Wed, 18 Oct 2017 14:49:36 +0000 (+0530)
Subject: rgw: Fix getter function names in RGWEnv
X-Git-Tag: v13.0.1~511^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dffb5c37285ccb5350cddc37435af7f15b81a7ba;p=ceph.git

rgw: Fix getter function names in RGWEnv

Fixed the getter function names as per the review comment in
https://github.com/ceph/ceph/pull/17432

Signed-off-by: Jos Collin <jcollin@redhat.com>
---

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 43a6a236354..49d675876bd 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -273,9 +273,9 @@ req_state::req_state(CephContext* _cct, RGWEnv* e, RGWUserInfo* u)
   : cct(_cct), cio(NULL), op(OP_UNKNOWN), user(u), has_acl_header(false),
     info(_cct, e)
 {
-  enable_ops_log = e->rgw_conf_get_enable_ops_log();
-  enable_usage_log = e->rgw_conf_get_enable_usage_log();
-  defer_to_bucket_acls = e->rgw_conf_get_defer_to_bucket_acls();
+  enable_ops_log = e->get_enable_ops_log();
+  enable_usage_log = e->get_enable_usage_log();
+  defer_to_bucket_acls = e->get_defer_to_bucket_acls();
   content_started = false;
   format = 0;
   formatter = NULL;
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index ca4361c8c38..4c1583fc1a3 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -412,15 +412,15 @@ public:
   bool exists_prefix(const char *prefix) const;
   void remove(const char *name);
   const std::map<string, string, ltstr_nocase>& get_map() const { return env_map; }
-  int rgw_conf_get_enable_ops_log() const {
+  int get_enable_ops_log() const {
     return conf.enable_ops_log;
   }
 
-  int rgw_conf_get_enable_usage_log() const {
+  int get_enable_usage_log() const {
     return conf.enable_usage_log;
   }
 
-  int rgw_conf_get_defer_to_bucket_acls() const {
+  int get_defer_to_bucket_acls() const {
     return conf.defer_to_bucket_acls;
   }
 };