From: Yao Zongyou <yaozongyou@vip.qq.com>
Date: Tue, 19 Dec 2017 13:19:48 +0000 (+0800)
Subject: common/config: cleanup remove some unused macros
X-Git-Tag: v13.0.2~674^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=318c62f8ae1648b14bd6ca77cac40b6856bced91;p=ceph.git

common/config: cleanup remove some unused macros

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
---

diff --git a/src/common/config.cc b/src/common/config.cc
index baa9de6609be..12040e5b7da3 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -41,7 +41,7 @@ using std::ostringstream;
 using std::pair;
 using std::string;
 
-const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config, /etc/ceph/$cluster.conf, ~/.ceph/$cluster.conf, $cluster.conf"
+static const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config, /etc/ceph/$cluster.conf, ~/.ceph/$cluster.conf, $cluster.conf"
 #if defined(__FreeBSD__)
     ", /usr/local/etc/ceph/$cluster.conf"
 #endif
diff --git a/src/common/config.h b/src/common/config.h
index 0e049920eeaf..ed1c23f9e373 100644
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -24,18 +24,8 @@
 #include "common/config_obs.h"
 #include "common/options.h"
 
-#define OSD_REP_PRIMARY 0
-#define OSD_REP_SPLAY   1
-#define OSD_REP_CHAIN   2
-
 class CephContext;
 
-extern const char *CEPH_CONF_FILE_DEFAULT;
-
-#define LOG_TO_STDERR_NONE 0
-#define LOG_TO_STDERR_SOME 1
-#define LOG_TO_STDERR_ALL 2
-
 /** This class represents the current Ceph configuration.
  *
  * For Ceph daemons, this is the daemon configuration.  Log levels, caching