From 4600a396d5322dc7583f1af8d59576da7cf938fd Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Fri, 24 Nov 2017 10:37:08 +0000 Subject: [PATCH] Remove NULL as last parameter to strjoin --- src/coredump/coredump.c | 2 +- src/import/pull-common.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c index 5673aa0f78..d3533790a1 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 cb2e3d9be2..c2a3a6aa8b 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; }