From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 21 Feb 2017 17:11:12 +0000 (+0100)
Subject: Revert "basic/strv: allow NULLs to be inserted into strv"
X-Git-Tag: v234~454^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcab914f7fb0570eb728907163ada55c6ae3d602;p=platform%2Fupstream%2Fsystemd.git

Revert "basic/strv: allow NULLs to be inserted into strv"

This reverts commit 18f71a3c8174774c5386c4aba94d54f3b5c36a84.

According to @keszybz we don't need this anymore, hence drop it:

https://github.com/systemd/systemd/pull/5131/commits/18f71a3c8174774c5386c4aba94d54f3b5c36a84#r102232368
---

diff --git a/src/basic/strv.c b/src/basic/strv.c
index 60f92e6..0eec868 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -564,6 +564,9 @@ int strv_extend_front(char ***l, const char *value) {
 
         /* Like strv_extend(), but prepends rather than appends the new entry */
 
+        if (!value)
+                return 0;
+
         n = strv_length(*l);
 
         /* Increase and overflow check. */
@@ -571,12 +574,9 @@ int strv_extend_front(char ***l, const char *value) {
         if (m < n)
                 return -ENOMEM;
 
-        if (value) {
-                v = strdup(value);
-                if (!v)
-                        return -ENOMEM;
-        } else
-                v = NULL;
+        v = strdup(value);
+        if (!v)
+                return -ENOMEM;
 
         c = realloc_multiply(*l, sizeof(char*), m);
         if (!c) {