Remove NULL as last parameter to strjoin

Daniel Lockyer · Daniel Lockyer · commit 4600a396d532 · 2017-11-24T10:37:08.000Z
diff --git 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
@@ -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;
         }

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ int pull_make_path(const char url, const char etag, const char *image_root, co`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`path = strjoin(image_root, "/", strempty(prefix), escaped_url, escaped_etag ? "." : "",`
`195`		`- strempty(escaped_etag), strempty(suffix), NULL);`
	`195`	`+ strempty(escaped_etag), strempty(suffix));`
`196`	`196`	`if (!path)`
`197`	`197`	`return -ENOMEM;`
`198`	`198`
`@@ -210,7 +210,7 @@ int pull_make_path(const char url, const char etag, const char *image_root, co`
`210`	`210`	`return r;`
`211`	`211`
`212`	`212`	`path = strjoin(image_root, "/", strempty(prefix), hash, escaped_etag ? "." : "",`
`213`		`- strempty(escaped_etag), strempty(suffix), NULL);`
	`213`	`+ strempty(escaped_etag), strempty(suffix));`
`214`	`214`	`if (!path)`
`215`	`215`	`return -ENOMEM;`
`216`	`216`	`}`