From a87f119afcfcc1c855a6ea2ba3d765966f1f2591 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Sat, 25 Feb 2017 03:02:29 +0100 Subject: [PATCH] cleanup: Remove faulty env processing functions The env_set_add_to_environmenti() and env_set_remove_from_environment() functions where not used in the code at all and they would cause an ASSERT() in setenv_str_ex() later on, as it would not allow the struct env_set *es pointer to be NULL (misc.c:807). Signed-off-by: David Sommerseth Acked-by: Gert Doering Message-Id: <20170225020229.17287-1-davids@openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14195.html Signed-off-by: Gert Doering --- src/openvpn/misc.c | 51 ---------------------------------------------- src/openvpn/misc.h | 4 ---- 2 files changed, 55 deletions(-) diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c index a2f45b61c..68d068767 100644 --- a/src/openvpn/misc.c +++ b/src/openvpn/misc.c @@ -701,57 +701,6 @@ env_set_inherit(struct env_set *es, const struct env_set *src) } } -void -env_set_add_to_environment(const struct env_set *es) -{ - if (es) - { - struct gc_arena gc = gc_new(); - const struct env_item *e; - - e = es->list; - - while (e) - { - const char *name; - const char *value; - - if (deconstruct_name_value(e->string, &name, &value, &gc)) - { - setenv_str(NULL, name, value); - } - - e = e->next; - } - gc_free(&gc); - } -} - -void -env_set_remove_from_environment(const struct env_set *es) -{ - if (es) - { - struct gc_arena gc = gc_new(); - const struct env_item *e; - - e = es->list; - - while (e) - { - const char *name; - const char *value; - - if (deconstruct_name_value(e->string, &name, &value, &gc)) - { - setenv_del(NULL, name); - } - - e = e->next; - } - gc_free(&gc); - } -} /* add/modify/delete environmental strings */ diff --git a/src/openvpn/misc.h b/src/openvpn/misc.h index 16be6219c..009767fdc 100644 --- a/src/openvpn/misc.h +++ b/src/openvpn/misc.h @@ -161,10 +161,6 @@ void env_set_print(int msglevel, const struct env_set *es); void env_set_inherit(struct env_set *es, const struct env_set *src); -void env_set_add_to_environment(const struct env_set *es); - -void env_set_remove_from_environment(const struct env_set *es); - /* Make arrays of strings */ const char **make_env_array(const struct env_set *es, -- 2.47.2