picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove NULL as last parameter to strjoin

Browse source
This commit is contained in:
Daniel Lockyer 2017-11-24 10:37:08 +00:00
parent a7419dbc59
commit 4600a396d5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/coredump/coredump.c
View file

@ -1215,7 +1215,7 @@ static int gather_pid_metadata(
if (get_process_environ(pid, &t) >= 0) if (get_process_environ(pid, &t) >= 0)
set_iovec_field_free(iovec, n_iovec, "COREDUMP_ENVIRON=", t); 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) if (t)
iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(t); iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(t);

4
src/import/pull-common.c
View file

@ -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 ? "." : "", path = strjoin(image_root, "/", strempty(prefix), escaped_url, escaped_etag ? "." : "",
strempty(escaped_etag), strempty(suffix), NULL); strempty(escaped_etag), strempty(suffix));
if (!path) if (!path)
return -ENOMEM; return -ENOMEM;
@ -210,7 +210,7 @@ int pull_make_path(const char *url, const char *etag, const char *image_root, co
return r; return r;
path = strjoin(image_root, "/", strempty(prefix), hash, escaped_etag ? "." : "", path = strjoin(image_root, "/", strempty(prefix), hash, escaped_etag ? "." : "",
strempty(escaped_etag), strempty(suffix), NULL); strempty(escaped_etag), strempty(suffix));
if (!path) if (!path)
return -ENOMEM; return -ENOMEM;
} }