From 81d621034badfd75edb5e1fc88334af9a87a18e3 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sat, 9 Apr 2016 14:04:09 -0400 Subject: tree-wide: remove useless NULLs from strjoina The coccinelle patch didn't work in some places, I have no idea why. --- src/shared/bus-util.c | 4 ++-- src/shared/path-lookup.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/shared') diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 0caaca03c7..2b86b1fcd6 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -2050,8 +2050,8 @@ static void log_job_error_with_service_result(const char* service, const char *r _cleanup_free_ char *t; t = strv_join((char**) extra_args, " "); - systemctl = strjoina("systemctl ", t ?: "", NULL); - journalctl = strjoina("journalctl ", t ?: "", NULL); + systemctl = strjoina("systemctl ", t ? : ""); + journalctl = strjoina("journalctl ", t ? : ""); } if (!isempty(result)) { diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index ca69a0aef2..167108ee1b 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -249,7 +249,7 @@ static int acquire_generator_dirs( if (!e) return -ENXIO; - prefix = strjoina(e, "/systemd/", NULL); + prefix = strjoina(e, "/systemd/"); break; } -- cgit v1.2.3-54-g00ecf