config: trim deadcode

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

diff --git a/src/common/config.cc b/src/common/config.cc
index ef5c6ec69db2c288df1dbdd4051e377cb0032286..3b9c9e234febaf937972d5c8c277ca6ee116238c 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -469,37 +469,6 @@ bool conf_set_conf_val(void *field, opt_type_t type, const char *val, long long
   return true;
 }
 
-static bool conf_reset_val(void *field, opt_type_t type)
-{
-  switch (type) {
-  case OPT_BOOL:
-    *(bool *)field = 0;
-    break;
-  case OPT_INT:
-    *(int *)field = 0;
-    break;
-  case OPT_LONGLONG:
-    *(long long *)field = 0;
-    break;
-  case OPT_STR:
-      *(char **)field = NULL;
-    break;
-  case OPT_FLOAT:
-    *(float *)field = 0;
-    break;
-  case OPT_DOUBLE:
-    *(double *)field = 0;
-    break;
-  case OPT_ADDR:
-    *(entity_addr_t *)field = entity_addr_t();
-    break;
-  default:
-    return false;
-  }
-
-  return true;
-}
-
 static void set_conf_name(config_option *opt)
 {
   char *newsection = (char *)opt->section;
@@ -535,58 +504,6 @@ static void set_conf_name(config_option *opt)
     opt->conf_name = (const char *)newconf;
 }
 
-static int def_conf_to_str(config_option *opt, char *buf, int len)
-{
-  int ret = 0;
-
-  switch (opt->type) {
-  case OPT_INT:
-  case OPT_BOOL:
-    ret = snprintf(buf, len, "%d", (int)opt->def_longlong);
-    break;
-  case OPT_LONGLONG:
-    ret = snprintf(buf, len, "%lld", opt->def_longlong);
-    break;
-  case OPT_STR:
-  case OPT_ADDR:
-    ret = snprintf(buf, len, "%s", opt->def_str);
-    break;
-  case OPT_FLOAT:
-  case OPT_DOUBLE:
-    ret = snprintf(buf, len, "%f", opt->def_double);
-    break;
-  default:
-    break;
-  }
-  return ret;
-}
-
-int ceph_def_conf_by_name(const char *name, char *buf, int buflen)
-{
-  char *newname = strdup(name);
-  int len = strlen(name);
-  config_option *opt;
-  int ret = 0;
-  int i;
-
-  for (i = 0; i < len; i++) {
-    if (newname[i] == ' ')
-      newname[i] = '_';
-  }
-
-  len = sizeof(config_optionsp)/sizeof(config_option);
-
-  for (i = 0; i < len; i++) {
-    opt = &config_optionsp[i];
-    if (strcmp(opt->name, newname) == 0) {
-      ret = def_conf_to_str(opt, buf, buflen);
-      break;
-    }
-  }
-  free(newname);
-  return ret;
-}
-
 static bool cmd_is_char(const char *cmd)
 {
   return ((cmd[0] == '-') &&
@@ -887,9 +804,6 @@ md_config_t::md_config_t()
 
   for (i = 0; i<len; i++) {
     opt = &config_optionsp[i];
-    if (opt->val_ptr) {
-      conf_reset_val(opt->val_ptr, opt->type);
-    }
     if (!conf_set_conf_val(opt->val_ptr,
          opt->type,
          opt->def_str,

diff --git a/src/common/config.h b/src/common/config.h
index 847a2e586515cfd081d08226a1c28b6c6e739bca..203148434da758489b56fa4058405c29dbb87bb0 100644 (file)
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -465,7 +465,6 @@ char *conf_post_process_val(const char *val);
 int conf_read_key(const char *alt_section, const char *key, opt_type_t type, void *out, void *def, bool free_old_val = false);
 bool conf_set_conf_val(void *field, opt_type_t type, const char *val);
 bool conf_cmd_equals(const char *cmd, const char *opt, char char_opt, unsigned int *val_pos);
-int ceph_def_conf_by_name(const char *name, char *buf, int len);
 
 bool ceph_resolve_file_search(string& filename_list, string& result);