From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 15 Feb 2021 13:55:40 +0000 (+0100)
Subject: basic/env-util: drop now-unused strv_env_set()
X-Git-Tag: v248-rc1~92^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99bfce10802d10a62ede7a21f45df5122a7eca27;p=thirdparty%2Fsystemd.git

basic/env-util: drop now-unused strv_env_set()
---

diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index 5f2b29d7b5b..b1313dbfff8 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -434,34 +434,6 @@ int strv_env_assign(char ***l, const char *key, const char *value) {
         return r;
 }
 
-char **strv_env_set(char **x, const char *p) {
-        _cleanup_strv_free_ char **ret = NULL;
-        size_t n, m;
-        char **k;
-
-        /* Overrides the env var setting of p, returns a new copy */
-
-        n = strv_length(x);
-        m = n + 2;
-        if (m < n) /* overflow? */
-                return NULL;
-
-        ret = new(char*, m);
-        if (!ret)
-                return NULL;
-
-        *ret = NULL;
-        k = ret;
-
-        if (env_append(ret, &k, x) < 0)
-                return NULL;
-
-        if (env_append(ret, &k, STRV_MAKE(p)) < 0)
-                return NULL;
-
-        return TAKE_PTR(ret);
-}
-
 char *strv_env_get_n(char **l, const char *name, size_t k, unsigned flags) {
         char **i;
 
diff --git a/src/basic/env-util.h b/src/basic/env-util.h
index 3f8995bf3db..c7b72b4b471 100644
--- a/src/basic/env-util.h
+++ b/src/basic/env-util.h
@@ -42,7 +42,6 @@ bool strv_env_name_or_assignment_is_valid(char **l);
 char **strv_env_merge(size_t n_lists, ...);
 char **strv_env_delete(char **x, size_t n_lists, ...); /* New copy */
 
-char **strv_env_set(char **x, const char *p); /* New copy ... */
 char **strv_env_unset(char **l, const char *p); /* In place ... */
 char **strv_env_unset_many(char **l, ...) _sentinel_;
 int strv_env_replace(char ***l, char *p); /* In place ... */
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index ce215fdd364..39be9532b35 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -59,24 +59,6 @@ static void test_strv_env_unset(void) {
         assert_se(strv_length(l) == 2);
 }
 
-static void test_strv_env_set(void) {
-        log_info("/* %s */", __func__);
-
-        _cleanup_strv_free_ char **l = NULL, **r = NULL;
-
-        l = strv_new("PIEP", "SCHLUMPF=SMURFF", "NANANANA=YES");
-        assert_se(l);
-
-        r = strv_env_set(l, "WALDO=WALDO");
-        assert_se(r);
-
-        assert_se(streq(r[0], "PIEP"));
-        assert_se(streq(r[1], "SCHLUMPF=SMURFF"));
-        assert_se(streq(r[2], "NANANANA=YES"));
-        assert_se(streq(r[3], "WALDO=WALDO"));
-        assert_se(strv_length(r) == 4);
-}
-
 static void test_strv_env_merge(void) {
         log_info("/* %s */", __func__);
 
@@ -378,7 +360,6 @@ int main(int argc, char *argv[]) {
         test_strv_env_delete();
         test_strv_env_get();
         test_strv_env_unset();
-        test_strv_env_set();
         test_strv_env_merge();
         test_env_strv_get_n();
         test_replace_env(false);