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 27cd6df414743f7c1bb770bf29381d0be1a2fa53..f52c0ae1d693d8e2a31dcee2604bc5cc5222a571 100644 (file)
--- 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 1018d5bdf0651e7e0ac9445644e90143dd78cdec..b3f428f944a8ea373130874a424c2cfae0f7a58c 100644 (file)
--- 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 607bf419e58a3c82224ec8608ac7cd2bf9a5861c..6843636a17107d931fcd42898c836b7960f86ab4 100644 (file)
--- 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 79b3f92a6abd35a34b2c0a4347af27504be1f8fa..4d5e1204cc077cc33df4435ae305c65a7ffcf3dc 100644 (file)
--- 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 c053524ceda4a1f8e809c9a1f828d769da37e771..c1c4334cb19f9a52a5f3a3a5d7ee99a54eb8bbca 100644 (file)
--- 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 2c3075c3a09c386289f3e00097d7137f0160374b..be74e3a4432accf52ee5c0a8187f9d1e77474bfd 100644 (file)
--- 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 45be3fbe310df88fd0d8d111223722e8526f3975..b15d8d96b709fea2552cb8b5f5c4c571694f5bdd 100644 (file)
--- 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();