From 3b20a16ed11ad423afc80c01dcf625b4b613ec40 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Sun, 15 Jul 2018 19:31:01 +0800
Subject: [PATCH] common/config: mark do_argv_commands() const

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/common/config.cc      | 12 +++++++-----
 src/common/config.h       | 10 +++++-----
 src/common/config_proxy.h |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/common/config.cc b/src/common/config.cc
index 5b1fdce0b3ace..f6233757f4f85 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -490,19 +490,21 @@ void md_config_impl<lp>::parse_env(ConfigValues& values,
 }
 
 template<LockPolicy lp>
-void md_config_impl<lp>::show_config(const ConfigValues& values, std::ostream& out)
+void md_config_impl<lp>::show_config(const ConfigValues& values,
+				     std::ostream& out) const
 {
   _show_config(values, &out, nullptr);
 }
 
 template<LockPolicy lp>
-void md_config_impl<lp>::show_config(const ConfigValues& values, Formatter *f)
+void md_config_impl<lp>::show_config(const ConfigValues& values,
+				     Formatter *f) const
 {
   _show_config(values, nullptr, f);
 }
 
 template<LockPolicy lp>
-void md_config_impl<lp>::config_options(Formatter *f)
+void md_config_impl<lp>::config_options(Formatter *f) const
 {
   f->open_array_section("options");
   for (const auto& i: schema) {
@@ -513,7 +515,7 @@ void md_config_impl<lp>::config_options(Formatter *f)
 
 template<LockPolicy lp>
 void md_config_impl<lp>::_show_config(const ConfigValues& values,
-				      std::ostream *out, Formatter *f)
+				      std::ostream *out, Formatter *f) const
 {
   if (out) {
     *out << "name = " << values.name << std::endl;
@@ -625,7 +627,7 @@ int md_config_impl<lp>::parse_argv(ConfigValues& values,
 }
 
 template<LockPolicy lp>
-void md_config_impl<lp>::do_argv_commands(const ConfigValues& values)
+void md_config_impl<lp>::do_argv_commands(const ConfigValues& values) const
 {
 
   if (do_show_config) {
diff --git a/src/common/config.h b/src/common/config.h
index 9fb577cd5b555..c1a0fe90463de 100644
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -142,7 +142,7 @@ public:
 		 std::vector<const char*>& args, int level=CONF_CMDLINE);
 
   // do any commands we got from argv (--show-config, --show-config-val)
-  void do_argv_commands(const ConfigValues& values);
+  void do_argv_commands(const ConfigValues& values) const;
 
   bool _internal_field(const string& k);
 
@@ -229,12 +229,12 @@ public:
 		   std::string const &key, std::string &out, bool emeta) const;
 
   /// dump all config values to a stream
-  void show_config(const ConfigValues& values, std::ostream& out);
+  void show_config(const ConfigValues& values, std::ostream& out) const;
   /// dump all config values to a formatter
-  void show_config(const ConfigValues& values, Formatter *f);
+  void show_config(const ConfigValues& values, Formatter *f) const;
   
   /// dump all config settings to a formatter
-  void config_options(Formatter *f);
+  void config_options(Formatter *f) const;
 
   /// dump config diff from default, conf, mon, etc.
   void diff(const ConfigValues& values,
@@ -272,7 +272,7 @@ private:
   void _refresh(ConfigValues& values, const Option& opt);
 
   void _show_config(const ConfigValues& values,
-		    std::ostream *out, Formatter *f);
+		    std::ostream *out, Formatter *f) const;
 
   void _get_my_sections(const ConfigValues& values,
 			std::vector <std::string> &sections) const;
diff --git a/src/common/config_proxy.h b/src/common/config_proxy.h
index fe38c3bc98f60..9c299b20cc8b4 100644
--- a/src/common/config_proxy.h
+++ b/src/common/config_proxy.h
@@ -52,7 +52,7 @@ public:
 				       std::forward<Callback>(cb),
 				       std::forward<Args>(args)...);
   }
-  void config_options(Formatter *f) {
+  void config_options(Formatter *f) const {
     config.config_options(f);
   }
   const Option* get_schema(const std::string& key) const {
@@ -202,7 +202,7 @@ public:
   void complain_about_parse_errors(CephContext *cct) {
     return config.complain_about_parse_errors(cct);
   }
-  void do_argv_commands() {
+  void do_argv_commands() const {
     Mutex::Locker l{lock};
     config.do_argv_commands(values);
   }
-- 
2.39.5