common/config: "conffile" -> "file"

Easier on the eyes

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/config.cc b/src/common/config.cc
index 1d8327775b856fb00e689785770bf8aca8471e1d..7a8150d2ef72340d913b594401aabf1cb06bb40b 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -57,7 +57,7 @@ const char *ceph_conf_level_name(int level)
   case CONF_DEFAULT: return "default";
   case CONF_MON: return "mon";
   case CONF_ENV: return "env";
-  case CONF_CONFFILE: return "conffile";
+  case CONF_FILE: return "file";
   case CONF_OVERRIDE: return "override";
   case CONF_FINAL: return "final";
   default: return "???";
@@ -418,7 +418,7 @@ int md_config_t::parse_config_files(const char *conf_files_str,
     int ret = _get_val_from_conf_file(my_sections, opt.name, val);
     if (ret == 0) {
       std::string error_message;
-      int r = _set_val(val, opt, CONF_CONFFILE, &error_message);
+      int r = _set_val(val, opt, CONF_FILE, &error_message);
       if (warnings != nullptr && (r < 0 || !error_message.empty())) {
         *warnings << "parse error setting '" << opt.name << "' to '" << val
                   << "'";

diff --git a/src/common/config.h b/src/common/config.h
index af4e50fd4af5f3422bc26d2b00acec10b13b2e92..6a515ad5012f813d88d74b82b2b76f6865f2566d 100644 (file)
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -31,7 +31,7 @@ class CephContext;
 enum {
   CONF_DEFAULT,
   CONF_MON,
-  CONF_CONFFILE,
+  CONF_FILE,
   CONF_ENV,
   CONF_OVERRIDE,
   CONF_FINAL