From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Tue, 1 Feb 2011 14:23:12 +0000 (-0800)
Subject: common: remove ceph_set_default_id
X-Git-Tag: v0.25~231^2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4380920b6ffe820dbb4c258752e16298d93c30a5;p=ceph.git

common: remove ceph_set_default_id

ceph_set_default_id was only ever used to set the default ID to "admin",
which it already was.

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

diff --git a/src/config.cc b/src/config.cc
index 27cd6df41474..f52c0ae1d693 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -51,11 +51,6 @@ static void fini_g_conf();
 
 const char *g_default_id = "admin";
 
-void ceph_set_default_id(const char *id)
-{
-  g_default_id = strdup(id);
-}
-
 static void env_override(char **ceph_var, const char * const env_var)
 {
   char *e = getenv(env_var);
diff --git a/src/config.h b/src/config.h
index 1018d5bdf065..b3f428f944a8 100644
--- a/src/config.h
+++ b/src/config.h
@@ -38,8 +38,6 @@ extern struct ceph_file_layout g_default_file_layout;
 extern bool g_daemon;
 extern const char *g_default_id;
 
-extern void ceph_set_default_id(const char *id);
-
 struct EntityName;
 
 enum log_to_stderr_t {
diff --git a/src/test/TestDoutStreambuf.cc b/src/test/TestDoutStreambuf.cc
index 607bf419e58a..6843636a1710 100644
--- a/src/test/TestDoutStreambuf.cc
+++ b/src/test/TestDoutStreambuf.cc
@@ -35,7 +35,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  ceph_set_default_id("admin");
   common_set_defaults(false);
   common_init(args, "ceph", true);
   set_foreground_logging();
diff --git a/src/test/TestSignalHandlers.cc b/src/test/TestSignalHandlers.cc
index 79b3f92a6abd..4d5e1204cc07 100644
--- a/src/test/TestSignalHandlers.cc
+++ b/src/test/TestSignalHandlers.cc
@@ -92,7 +92,6 @@ int main(int argc, const char **argv)
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  ceph_set_default_id("admin");
 
   common_set_defaults(false);
   common_init(args, "TestSignalHandlers", true);
diff --git a/src/test/TestTimers.cc b/src/test/TestTimers.cc
index c053524ceda4..c1c4334cb19f 100644
--- a/src/test/TestTimers.cc
+++ b/src/test/TestTimers.cc
@@ -254,7 +254,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  ceph_set_default_id("admin");
   common_set_defaults(false);
   common_init(args, "ceph", true);
   set_foreground_logging();
diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index 2c3075c3a09c..be74e3a4432a 100644
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -129,8 +129,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  ceph_set_default_id("admin");
-
   common_set_defaults(false);
   common_init(args, "ceph", true);
   set_foreground_logging();
diff --git a/src/tools/gceph.cc b/src/tools/gceph.cc
index 45be3fbe310d..b15d8d96b709 100644
--- a/src/tools/gceph.cc
+++ b/src/tools/gceph.cc
@@ -74,8 +74,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  ceph_set_default_id("admin");
-
   common_set_defaults(false);
   common_init(args, "cephtool", true);
   set_foreground_logging();