From: Daniel Lockyer <thisisdaniellockyer@gmail.com>
Date: Fri, 24 Nov 2017 10:37:08 +0000 (+0000)
Subject: Remove NULL as last parameter to strjoin
X-Git-Tag: v236~132^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7454%2Fhead;p=thirdparty%2Fsystemd.git

Remove NULL as last parameter to strjoin
---

diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 5673aa0f785..d3533790a10 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -1215,7 +1215,7 @@ static int gather_pid_metadata(
         if (get_process_environ(pid, &t) >= 0)
                 set_iovec_field_free(iovec, n_iovec, "COREDUMP_ENVIRON=", t);
 
-        t = strjoin("COREDUMP_TIMESTAMP=", context[CONTEXT_TIMESTAMP], "000000", NULL);
+        t = strjoin("COREDUMP_TIMESTAMP=", context[CONTEXT_TIMESTAMP], "000000");
         if (t)
                 iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(t);
 
diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index cb2e3d9be29..c2a3a6aa8b1 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -192,7 +192,7 @@ int pull_make_path(const char *url, const char *etag, const char *image_root, co
         }
 
         path = strjoin(image_root, "/", strempty(prefix), escaped_url, escaped_etag ? "." : "",
-                       strempty(escaped_etag), strempty(suffix), NULL);
+                       strempty(escaped_etag), strempty(suffix));
         if (!path)
                 return -ENOMEM;
 
@@ -210,7 +210,7 @@ int pull_make_path(const char *url, const char *etag, const char *image_root, co
                         return r;
 
                 path = strjoin(image_root, "/", strempty(prefix), hash, escaped_etag ? "." : "",
-                               strempty(escaped_etag), strempty(suffix), NULL);
+                               strempty(escaped_etag), strempty(suffix));
                 if (!path)
                         return -ENOMEM;
         }