libcharon: Remove unused charon->name

diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
index e7e0c9db0d721210aa10dd9dd471a6d732eefaf8..a70d314af81cc7ec88585e772d1fae10e50e5421 100644 (file)
--- a/src/charon-cmd/charon-cmd.c
+++ b/src/charon-cmd/charon-cmd.c
@@ -339,7 +339,7 @@ int main(int argc, char *argv[])
                exit(SS_RC_INITIALIZATION_FAILED);
        }
        atexit(libcharon_deinit);
-       if (!libcharon_init("charon-cmd"))
+       if (!libcharon_init())
        {
                exit(SS_RC_INITIALIZATION_FAILED);
        }

diff --git a/src/charon-nm/charon-nm.c b/src/charon-nm/charon-nm.c
index 830d44b390e3171fdadb686e51de2f5376390bb7..32cec36ec05e2a9dfc4bfed4a45acb2bef73c1f4 100644 (file)
--- a/src/charon-nm/charon-nm.c
+++ b/src/charon-nm/charon-nm.c
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
                exit(SS_RC_INITIALIZATION_FAILED);
        }
 
-       if (!libcharon_init("charon-nm"))
+       if (!libcharon_init())
        {
                dbg_syslog(DBG_DMN, 1, "initialization failed - aborting charon-nm");
                goto deinit;

diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c
index 1b9fc1cfbefd539c3793fa7686978411f74e28fc..9a22f9ad9e02e4d651ccba2a30b896bc16dfba88 100644 (file)
--- a/src/charon-tkm/src/charon-tkm.c
+++ b/src/charon-tkm/src/charon-tkm.c
@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
                exit(status);
        }
 
-       if (!libcharon_init(dmn_name))
+       if (!libcharon_init())
        {
                dbg_syslog(DBG_DMN, 1, "initialization failed - aborting %s", dmn_name);
                goto deinit;

diff --git a/src/charon-tkm/tests/tests.c b/src/charon-tkm/tests/tests.c
index e6e3f301da3be8b4b9f2ed76e893b6a01eaa67de..18754c717dc3f725ac48bfcdfa9154b05c15dba5 100644 (file)
--- a/src/charon-tkm/tests/tests.c
+++ b/src/charon-tkm/tests/tests.c
@@ -51,7 +51,7 @@ static bool test_runner_init(bool init)
        if (init)
        {
                libhydra_init();
-               libcharon_init("test_runner");
+               libcharon_init();
                lib->settings->set_int(lib->settings,
                                                           "test_runner.filelog.stdout.default", 0);
                charon->load_loggers(charon, NULL, FALSE);

diff --git a/src/charon/charon.c b/src/charon/charon.c
index 8a89c763e28d461176b7751c9b087a9a892511d0..089ac4570e9974c9924954b2e30b722e06093a40 100644 (file)
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -311,7 +311,7 @@ int main(int argc, char *argv[])
                exit(SS_RC_INITIALIZATION_FAILED);
        }
 
-       if (!libcharon_init("charon"))
+       if (!libcharon_init())
        {
                dbg_stderr(DBG_DMN, 1, "initialization failed - aborting charon");
                goto deinit;

diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c
index d26991f9f40b7790348a928e1efe4d4f7d5c1df6..ac6d697a542bcfe13cd6cca3df739ff0774da279 100644 (file)
--- a/src/conftest/conftest.c
+++ b/src/conftest/conftest.c
@@ -446,7 +446,7 @@ int main(int argc, char *argv[])
                library_deinit();
                return SS_RC_INITIALIZATION_FAILED;
        }
-       if (!libcharon_init("conftest"))
+       if (!libcharon_init())
        {
                libcharon_deinit();
                libhydra_deinit();

diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/jni/libandroidbridge/charonservice.c
index b50d5ace66063c05d68e949bc60e5fcf59e718dd..03351b721df71c946bad5440d81d0e1541b77b9c 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/charonservice.c
+++ b/src/frontends/android/jni/libandroidbridge/charonservice.c
@@ -626,7 +626,7 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
                return FALSE;
        }
 
-       if (!libcharon_init("charon"))
+       if (!libcharon_init())
        {
                libcharon_deinit();
                libipsec_deinit();

diff --git a/src/frontends/osx/charon-xpc/charon-xpc.c b/src/frontends/osx/charon-xpc/charon-xpc.c
index 4b7cd3a503e1ed737e7f90dc044a025c93a43fe1..2235be12d4233a3f6226113a730d3fbef48ee030 100644 (file)
--- a/src/frontends/osx/charon-xpc/charon-xpc.c
+++ b/src/frontends/osx/charon-xpc/charon-xpc.c
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
                exit(SS_RC_INITIALIZATION_FAILED);
        }
        atexit(libcharon_deinit);
-       if (!libcharon_init("charon-xpc"))
+       if (!libcharon_init())
        {
                exit(SS_RC_INITIALIZATION_FAILED);
        }

diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index 682b0eef11611e24411f747f91dc122cc9680ab5..0cecd1d3b0a82c17da19138ac329931e8cad7943 100644 (file)
--- a/src/libcharon/daemon.c
+++ b/src/libcharon/daemon.c
@@ -473,7 +473,6 @@ static void destroy(private_daemon_t *this)
        DESTROY_IF(this->public.bus);
        this->loggers->destroy_function(this->loggers, (void*)logger_entry_destroy);
        this->mutex->destroy(this->mutex);
-       free((void*)this->public.name);
        free(this);
 }
 
@@ -558,7 +557,7 @@ METHOD(daemon_t, initialize, bool,
 /**
  * Create the daemon.
  */
-private_daemon_t *daemon_create(const char *name)
+private_daemon_t *daemon_create()
 {
        private_daemon_t *this;
 
@@ -569,7 +568,6 @@ private_daemon_t *daemon_create(const char *name)
                        .load_loggers = _load_loggers,
                        .set_level = _set_level,
                        .bus = bus_create(),
-                       .name = strdup(name ?: "libcharon"),
                },
                .loggers = linked_list_create(),
                .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
@@ -607,7 +605,7 @@ void libcharon_deinit()
 /**
  * Described in header.
  */
-bool libcharon_init(const char *name)
+bool libcharon_init()
 {
        private_daemon_t *this;
 
@@ -618,7 +616,7 @@ bool libcharon_init(const char *name)
                return !this->integrity_failed;
        }
 
-       this = daemon_create(name);
+       this = daemon_create();
 
        /* for uncritical pseudo random numbers */
        srandom(time(NULL) + getpid());

diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index 24e623c444b46c37a41d2bb5972744675f2dec04..36242bb046a671787f2b9ec6bdc34987935e2ee8 100644 (file)
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -271,11 +271,6 @@ struct daemon_t {
        mediation_manager_t *mediation_manager;
 #endif /* ME */
 
-       /**
-        * Name of the binary that uses the library (used for settings etc.)
-        */
-       const char *name;
-
        /**
         * Initialize the daemon.
         *
@@ -324,12 +319,11 @@ extern daemon_t *charon;
  * calling initialize().
  *
  * libcharon_init() may be called multiple times in a single process, but each
- * caller should call libcharon_deinit() for each call to libcharon_init().
+ * caller must call libcharon_deinit() for each call to libcharon_init().
  *
- * @param name name of the binary that uses the library
  * @return             FALSE if integrity check failed
  */
-bool libcharon_init(const char *name);
+bool libcharon_init();
 
 /**
  * Deinitialize libcharon and destroy the "charon" instance of daemon_t.