From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Mon, 4 Apr 2011 16:25:37 +0000 (-0700)
Subject: config: remove some unecessary g_conf references
X-Git-Tag: v0.27~164
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32274050616ddf913d59643974c99384f43da4ee;p=ceph.git

config: remove some unecessary g_conf references

Class methods of md_config_t should refer to the enclosing config.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---

diff --git a/src/common/config.cc b/src/common/config.cc
index 9a3a5015c85d2..0d7bb9e826438 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -711,13 +711,13 @@ get_val(const char *key, char **buf, int len) const
 void md_config_t::
 get_my_sections(std::vector <std::string> &sections)
 {
-  sections.push_back(g_conf.name->to_str());
+  sections.push_back(name->to_str());
 
-  std::string alt_name(g_conf.name->get_type_name());
-  alt_name += g_conf.name->get_id();
+  std::string alt_name(name->get_type_name());
+  alt_name += name->get_id();
   sections.push_back(alt_name);
 
-  sections.push_back(g_conf.name->get_type_name());
+  sections.push_back(name->get_type_name());
 
   sections.push_back("global");
 }
@@ -908,15 +908,15 @@ conf_post_process_val(std::string &val) const
       if (strncmp(val.c_str() + s + 1, CONF_METAVARIABLES[i], clen))
 	continue;
       if (strcmp(CONF_METAVARIABLES[i], "type")==0)
-	out += g_conf.name->get_type_name();
+	out += name->get_type_name();
       else if (strcmp(CONF_METAVARIABLES[i], "name")==0)
-	out += g_conf.name->to_cstr();
+	out += name->to_cstr();
       else if (strcmp(CONF_METAVARIABLES[i], "host")==0)
-	out += g_conf.host;
+	out += host;
       else if (strcmp(CONF_METAVARIABLES[i], "num")==0)
-	out += g_conf.name->get_id().c_str();
+	out += name->get_id().c_str();
       else if (strcmp(CONF_METAVARIABLES[i], "id")==0)
-	out += g_conf.name->get_id().c_str();
+	out += name->get_id().c_str();
       else
 	assert(0); // unreachable
       break;