From 3fe7a210f1277a61b1281c91684103c730234429 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Sun, 23 Oct 2016 11:43:27 -0400

Subject: [PATCH] tree-wide: drop NULL sentinel from strjoin

This makes strjoin and strjoina more similar and avoids the useless final

argument.

spatch -I . -I ./src -I ./src/basic -I ./src/basic -I ./src/shared -I ./src/shared -I ./src/network -I ./src/locale -I ./src/login -I ./src/journal -I ./src/journal -I ./src/timedate -I ./src/timesync -I ./src/nspawn -I ./src/resolve -I ./src/resolve -I ./src/systemd -I ./src/core -I ./src/core -I ./src/libudev -I ./src/udev -I ./src/udev/net -I ./src/udev -I ./src/libsystemd/sd-bus -I ./src/libsystemd/sd-event -I ./src/libsystemd/sd-login -I ./src/libsystemd/sd-netlink -I ./src/libsystemd/sd-network -I ./src/libsystemd/sd-hwdb -I ./src/libsystemd/sd-device -I ./src/libsystemd/sd-id128 -I ./src/libsystemd-network --sp-file coccinelle/strjoin.cocci --in-place $(git ls-files src/*.c)

git grep -e '\bstrjoin\b.*NULL' -l|xargs sed -i -r 's/strjoin\((.*), NULL\)/strjoin(\1)/'

This might have missed a few cases (spatch has a really hard time dealing

with _cleanup_ macros), but that's no big issue, they can always be fixed

later.

(cherry picked from commit 605405c6cc934466951b0c6bad5a9553620bcb08)

---

 coccinelle/strjoin.cocci                          | 16 +++++++++++++++

 src/backlight/backlight.c                         |  4 ++--

 src/basic/btrfs-util.c                            |  2 +-

 src/basic/cgroup-util.c                           | 16 +++++++--------

 src/basic/conf-files.c                            |  2 +-

 src/basic/fileio.c                                |  6 +++---

 src/basic/fs-util.c                               |  2 +-

 src/basic/mount-util.c                            |  2 +-

 src/basic/path-util.c                             | 12 +++++-------

 src/basic/process-util.c                          |  6 +++---

 src/basic/string-util.c                           |  2 +-

 src/basic/string-util.h                           |  3 ++-

 src/basic/unit-name.c                             |  4 ++--

 src/basic/util.c                                  |  2 +-

 src/cgls/cgls.c                                   |  2 +-

 src/cgtop/cgtop.c                                 |  2 +-

 src/core/cgroup.c                                 |  7 ++++---

 src/core/dbus-execute.c                           |  2 +-

 src/core/dbus-unit.c                              |  6 +++---

 src/core/device.c                                 |  2 +-

 src/core/execute.c                                | 10 +++++-----

 src/core/locale-setup.c                           |  2 +-

 src/core/manager.c                                |  2 +-

 src/core/namespace.c                              |  2 +-

 src/core/service.c                                |  2 +-

 src/core/timer.c                                  |  4 ++--

 src/core/unit.c                                   |  4 ++--

 src/coredump/coredump.c                           |  9 +++++++--

 src/coredump/coredumpctl.c                        |  4 ++--

 src/cryptsetup/cryptsetup-generator.c             | 12 ++++++------

 src/debug-generator/debug-generator.c             |  4 ++--

 src/delta/delta.c                                 |  8 ++++----

 src/escape/escape.c                               |  2 +-

 src/fstab-generator/fstab-generator.c             | 14 ++++++-------

 src/gpt-auto-generator/gpt-auto-generator.c       | 24 +++++++++++------------

 src/hibernate-resume/hibernate-resume-generator.c |  2 +-

 src/hostname/hostnamed.c                          |  2 +-

 src/hwdb/hwdb.c                                   |  2 +-

 src/import/import-raw.c                           |  2 +-

 src/import/import-tar.c                           |  2 +-

 src/journal-remote/journal-gatewayd.c             |  2 +-

 src/journal-remote/journal-upload.c               |  4 ++--

 src/journal/journalctl.c                          |  2 +-

 src/journal/journald-server.c                     |  6 +++---

 src/journal/journald-wall.c                       |  2 +-

 src/journal/sd-journal.c                          |  6 +++---

 src/libsystemd/sd-bus/bus-kernel.c                |  2 +-

 src/libsystemd/sd-bus/busctl-introspect.c         |  2 +-

 src/libsystemd/sd-bus/busctl.c                    |  4 ++--

 src/libsystemd/sd-bus/sd-bus.c                    |  6 +++---

 src/libsystemd/sd-bus/test-bus-objects.c          |  2 +-

 src/libsystemd/sd-device/device-enumerator.c      |  2 +-

 src/libsystemd/sd-path/sd-path.c                  |  8 ++++----

 src/locale/keymap-util.c                          |  6 +++---

 src/login/logind-inhibit.c                        |  2 +-

 src/login/logind-session.c                        |  2 +-

 src/login/pam_systemd.c                           |  2 +-

 src/machine/machine.c                             |  2 +-

 src/mount/mount-tool.c                            |  4 ++--

 src/nspawn/nspawn-mount.c                         |  4 ++--

 src/nspawn/nspawn.c                               |  4 ++--

 src/rc-local-generator/rc-local-generator.c       |  4 ++--

 src/resolve/resolved-dns-dnssec.c                 |  2 +-

 src/resolve/resolved-dns-rr.c                     | 14 ++++++-------

 src/resolve/test-dnssec-complex.c                 |  2 +-

 src/rfkill/rfkill.c                               |  4 ++--

 src/run/run.c                                     |  2 +-

 src/shared/base-filesystem.c                      |  2 +-

 src/shared/bus-util.c                             |  4 ++--

 src/shared/cgroup-show.c                          |  2 +-

 src/shared/conf-parser.c                          |  2 +-

 src/shared/dns-domain.c                           |  4 ++--

 src/shared/dropin.c                               | 10 +++++-----

 src/shared/fstab-util.c                           |  2 +-

 src/shared/install-printf.c                       |  2 +-

 src/shared/install.c                              | 10 +++++-----

 src/shared/machine-image.c                        |  2 +-

 src/shared/path-lookup.c                          |  4 ++--

 src/systemctl/systemctl.c                         | 10 +++++-----

 src/sysv-generator/sysv-generator.c               | 10 +++++-----

 src/test/test-copy.c                              |  4 ++--

 src/test/test-date.c                              |  4 ++--

 src/test/test-fileio.c                            |  2 +-

 src/test/test-namespace.c                         |  8 ++++----

 src/test/test-path.c                              |  2 +-

 src/test/test-replace-var.c                       |  2 +-

 src/tmpfiles/tmpfiles.c                           |  4 ++--

 src/udev/udev-builtin-hwdb.c                      |  2 +-

 src/udev/udevadm-hwdb.c                           |  2 +-

 89 files changed, 215 insertions(+), 194 deletions(-)

 create mode 100644 coccinelle/strjoin.cocci

diff --git a/coccinelle/strjoin.cocci b/coccinelle/strjoin.cocci

new file mode 100644

index 0000000000..675760e37a

--- /dev/null

+++ b/coccinelle/strjoin.cocci

@@ -0,0 +1,16 @@

+@@

+expression list args;

+@@

+- strjoin(args, NULL);

++ strjoin(args);

+@@

+expression t;

+expression list args;

+@@

+- t = strjoin(args, NULL);

++ t = strjoin(args);

+@@

+expression list args;

+@@

+- return strjoin(args, NULL);

++ return strjoin(args);

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c

index 7c59f60d5f..c909b5bb51 100644

--- a/src/backlight/backlight.c

+++ b/src/backlight/backlight.c

@@ -357,9 +357,9 @@ int main(int argc, char *argv[]) {

                         return EXIT_FAILURE;

                 }

-                saved = strjoin("/var/lib/systemd/backlight/", escaped_path_id, ":", escaped_ss, ":", escaped_sysname, NULL);

+                saved = strjoin("/var/lib/systemd/backlight/", escaped_path_id, ":", escaped_ss, ":", escaped_sysname);

         } else

-                saved = strjoin("/var/lib/systemd/backlight/", escaped_ss, ":", escaped_sysname, NULL);

+                saved = strjoin("/var/lib/systemd/backlight/", escaped_ss, ":", escaped_sysname);

         if (!saved) {

                 log_oom();

diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c

index 359d85f2e8..656bb13719 100644

--- a/src/basic/btrfs-util.c

+++ b/src/basic/btrfs-util.c

@@ -1642,7 +1642,7 @@ static int subvol_snapshot_children(int old_fd, int new_fd, const char *subvolum

                         if (old_child_fd < 0)

                                 return -errno;

-                        np = strjoin(subvolume, "/", ino_args.name, NULL);

+                        np = strjoin(subvolume, "/", ino_args.name);

                         if (!np)

                                 return -ENOMEM;

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c

index 134e6e3664..63c913f14d 100644

--- a/src/basic/cgroup-util.c

+++ b/src/basic/cgroup-util.c

@@ -345,7 +345,7 @@ int cg_kill_recursive(

         while ((r = cg_read_subgroup(d, &fn)) > 0) {

                 _cleanup_free_ char *p = NULL;

-                p = strjoin(path, "/", fn, NULL);

+                p = strjoin(path, "/", fn);

                 free(fn);

                 if (!p)

                         return -ENOMEM;

@@ -479,7 +479,7 @@ int cg_migrate_recursive(

         while ((r = cg_read_subgroup(d, &fn)) > 0) {

                 _cleanup_free_ char *p = NULL;

-                p = strjoin(pfrom, "/", fn, NULL);

+                p = strjoin(pfrom, "/", fn);

                 free(fn);

                 if (!p)

                         return -ENOMEM;

@@ -562,11 +562,11 @@ static int join_path_legacy(const char *controller, const char *path, const char

         if (isempty(path) && isempty(suffix))

                 t = strappend("/sys/fs/cgroup/", dn);

         else if (isempty(path))

-                t = strjoin("/sys/fs/cgroup/", dn, "/", suffix, NULL);

+                t = strjoin("/sys/fs/cgroup/", dn, "/", suffix);

         else if (isempty(suffix))

-                t = strjoin("/sys/fs/cgroup/", dn, "/", path, NULL);

+                t = strjoin("/sys/fs/cgroup/", dn, "/", path);

         else

-                t = strjoin("/sys/fs/cgroup/", dn, "/", path, "/", suffix, NULL);

+                t = strjoin("/sys/fs/cgroup/", dn, "/", path, "/", suffix);

         if (!t)

                 return -ENOMEM;

@@ -586,7 +586,7 @@ static int join_path_unified(const char *path, const char *suffix, char **fs) {

         else if (isempty(suffix))

                 t = strappend("/sys/fs/cgroup/", path);

         else

-                t = strjoin("/sys/fs/cgroup/", path, "/", suffix, NULL);

+                t = strjoin("/sys/fs/cgroup/", path, "/", suffix);

         if (!t)

                 return -ENOMEM;

@@ -613,7 +613,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch

                 else if (!path)

                         t = strdup(suffix);

                 else

-                        t = strjoin(path, "/", suffix, NULL);

+                        t = strjoin(path, "/", suffix);

                 if (!t)

                         return -ENOMEM;

@@ -1145,7 +1145,7 @@ int cg_is_empty_recursive(const char *controller, const char *path) {

                 while ((r = cg_read_subgroup(d, &fn)) > 0) {

                         _cleanup_free_ char *p = NULL;

-                        p = strjoin(path, "/", fn, NULL);

+                        p = strjoin(path, "/", fn);

                         free(fn);

                         if (!p)

                                 return -ENOMEM;

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c

index c781610e14..c0c22610d7 100644

--- a/src/basic/conf-files.c

+++ b/src/basic/conf-files.c

@@ -60,7 +60,7 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char

                 if (!dirent_is_file_with_suffix(de, suffix))

                         continue;

-                p = strjoin(dirpath, "/", de->d_name, NULL);

+                p = strjoin(dirpath, "/", de->d_name);

                 if (!p)

                         return -ENOMEM;

diff --git a/src/basic/fileio.c b/src/basic/fileio.c

index 1cfb7a98f5..1615456659 100644

--- a/src/basic/fileio.c

+++ b/src/basic/fileio.c

@@ -676,7 +676,7 @@ static int load_env_file_push(

                 return -EINVAL;

         }

-        p = strjoin(key, "=", strempty(value), NULL);

+        p = strjoin(key, "=", strempty(value));

         if (!p)

                 return -ENOMEM;

@@ -963,9 +963,9 @@ static int search_and_fopen_internal(const char *path, const char *mode, const c

                 FILE *f;

                 if (root)

-                        p = strjoin(root, *i, "/", path, NULL);

+                        p = strjoin(root, *i, "/", path);

                 else

-                        p = strjoin(*i, "/", path, NULL);

+                        p = strjoin(*i, "/", path);

                 if (!p)

                         return -ENOMEM;

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c

index 48952a1c26..d2c322a0de 100644

--- a/src/basic/fs-util.c

+++ b/src/basic/fs-util.c

@@ -742,7 +742,7 @@ int chase_symlinks(const char *path, const char *_root, char **ret) {

                                 /* A relative destination. If so, this is what we'll prefix what's left to do with what

                                  * we just read, and start the loop again, but remain in the current directory. */

-                                joined = strjoin("/", destination, todo, NULL);

+                                joined = strjoin("/", destination, todo);

                                 if (!joined)

                                         return -ENOMEM;

diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c

index c8f8022578..5d37fb48be 100644

--- a/src/basic/mount-util.c

+++ b/src/basic/mount-util.c

@@ -642,7 +642,7 @@ static char* mount_flags_to_string(long unsigned flags) {

                     FLAG(MS_I_VERSION),

                     FLAG(MS_STRICTATIME),

                     FLAG(MS_LAZYTIME),

-                    y, NULL);

+                    y);

         if (!x)

                 return NULL;

         if (!y)

diff --git a/src/basic/path-util.c b/src/basic/path-util.c

index fd38f51c4c..5cdac50c68 100644

--- a/src/basic/path-util.c

+++ b/src/basic/path-util.c

@@ -83,7 +83,7 @@ char *path_make_absolute(const char *p, const char *prefix) {

         if (path_is_absolute(p) || !prefix)

                 return strdup(p);

-        return strjoin(prefix, "/", p, NULL);

+        return strjoin(prefix, "/", p);

 }

 int path_make_absolute_cwd(const char *p, char **ret) {

@@ -104,7 +104,7 @@ int path_make_absolute_cwd(const char *p, char **ret) {

                 if (!cwd)

                         return negative_errno();

-                c = strjoin(cwd, "/", p, NULL);

+                c = strjoin(cwd, "/", p);

         }

         if (!c)

                 return -ENOMEM;

@@ -454,13 +454,11 @@ char* path_join(const char *root, const char *path, const char *rest) {

                 return strjoin(root, endswith(root, "/") ? "" : "/",

                                path[0] == '/' ? path+1 : path,

                                rest ? (endswith(path, "/") ? "" : "/") : NULL,

-                               rest && rest[0] == '/' ? rest+1 : rest,

-                               NULL);

+                               rest && rest[0] == '/' ? rest+1 : rest);

         else

                 return strjoin(path,

                                rest ? (endswith(path, "/") ? "" : "/") : NULL,

-                               rest && rest[0] == '/' ? rest+1 : rest,

-                               NULL);

+                               rest && rest[0] == '/' ? rest+1 : rest);

 }

 int find_binary(const char *name, char **ret) {

@@ -504,7 +502,7 @@ int find_binary(const char *name, char **ret) {

                 if (!path_is_absolute(element))

                         continue;

-                j = strjoin(element, "/", name, NULL);

+                j = strjoin(element, "/", name);

                 if (!j)

                         return -ENOMEM;

diff --git a/src/basic/process-util.c b/src/basic/process-util.c

index 54b644ad56..48a5c719af 100644

--- a/src/basic/process-util.c

+++ b/src/basic/process-util.c

@@ -236,14 +236,14 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *

                         return h;

                 if (max_length == 0)

-                        r = strjoin("[", t, "]", NULL);

+                        r = strjoin("[", t, "]");

                 else {

                         size_t l;

                         l = strlen(t);

                         if (l + 3 <= max_length)

-                                r = strjoin("[", t, "]", NULL);

+                                r = strjoin("[", t, "]");

                         else if (max_length <= 6) {

                                 r = new(char, max_length);

@@ -263,7 +263,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *

                                         e--;

                                 *e = 0;

-                                r = strjoin("[", t, "...]", NULL);

+                                r = strjoin("[", t, "...]");

                         }

                 }

                 if (!r)

diff --git a/src/basic/string-util.c b/src/basic/string-util.c

index 6b06e643c9..2ba3604ba0 100644

--- a/src/basic/string-util.c

+++ b/src/basic/string-util.c

@@ -218,7 +218,7 @@ char *strappend(const char *s, const char *suffix) {

         return strnappend(s, suffix, suffix ? strlen(suffix) : 0);

 }

-char *strjoin(const char *x, ...) {

+char *strjoin_real(const char *x, ...) {

         va_list ap;

         size_t l;

         char *r, *p;

diff --git a/src/basic/string-util.h b/src/basic/string-util.h

index d029d538bd..0175803302 100644

--- a/src/basic/string-util.h

+++ b/src/basic/string-util.h

@@ -116,7 +116,8 @@ const char* split(const char **state, size_t *l, const char *separator, bool quo

 char *strappend(const char *s, const char *suffix);

 char *strnappend(const char *s, const char *suffix, size_t length);

-char *strjoin(const char *x, ...) _sentinel_;

+char *strjoin_real(const char *x, ...) _sentinel_;

+#define strjoin(a, ...) strjoin_real((a), __VA_ARGS__, NULL)

 #define strjoina(a, ...)                                                \

         ({                                                              \

diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c

index fe883b95c7..0a6efa449a 100644

--- a/src/basic/unit-name.c

+++ b/src/basic/unit-name.c

@@ -273,7 +273,7 @@ int unit_name_build(const char *prefix, const char *instance, const char *suffix

         if (!instance)

                 s = strappend(prefix, suffix);

         else

-                s = strjoin(prefix, "@", instance, suffix, NULL);

+                s = strjoin(prefix, "@", instance, suffix);

         if (!s)

                 return -ENOMEM;

@@ -554,7 +554,7 @@ int unit_name_from_path_instance(const char *prefix, const char *path, const cha

         if (r < 0)

                 return r;

-        s = strjoin(prefix, "@", p, suffix, NULL);

+        s = strjoin(prefix, "@", p, suffix);

         if (!s)

                 return -ENOMEM;

diff --git a/src/basic/util.c b/src/basic/util.c

index ec7939dc83..0f65e4839c 100644

--- a/src/basic/util.c

+++ b/src/basic/util.c

@@ -131,7 +131,7 @@ static int do_execute(char **directories, usec_t timeout, char *argv[]) {

                         if (r < 0)

                                 return log_oom();

-                        path = strjoin(*directory, "/", de->d_name, NULL);

+                        path = strjoin(*directory, "/", de->d_name);

                         if (!path)

                                 return log_oom();

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c

index adf488e8e1..b55aa86a40 100644

--- a/src/cgls/cgls.c

+++ b/src/cgls/cgls.c

@@ -223,7 +223,7 @@ int main(int argc, char *argv[]) {

                                 controller = c ?: SYSTEMD_CGROUP_CONTROLLER;

                                 if (p) {

-                                        j = strjoin(root, "/", p, NULL);

+                                        j = strjoin(root, "/", p);

                                         if (!j) {

                                                 r = log_oom();

                                                 goto finish;

diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c

index aba17c9829..af5c3d8695 100644

--- a/src/cgtop/cgtop.c

+++ b/src/cgtop/cgtop.c

@@ -431,7 +431,7 @@ static int refresh_one(

                 if (r == 0)

                         break;

-                p = strjoin(path, "/", fn, NULL);

+                p = strjoin(path, "/", fn);

                 if (!p)

                         return -ENOMEM;

diff --git a/src/core/cgroup.c b/src/core/cgroup.c

index 23a92f9651..d662b21cb9 100644

--- a/src/core/cgroup.c

+++ b/src/core/cgroup.c

@@ -1201,9 +1201,10 @@ char *unit_default_cgroup_path(Unit *u) {

                 return NULL;

         if (slice)

-                return strjoin(u->manager->cgroup_root, "/", slice, "/", escaped, NULL);

+                return strjoin(u->manager->cgroup_root, "/", slice, "/",

+                               escaped);

         else

-                return strjoin(u->manager->cgroup_root, "/", escaped, NULL);

+                return strjoin(u->manager->cgroup_root, "/", escaped);

 }

 int unit_set_cgroup_path(Unit *u, const char *path) {

@@ -1643,7 +1644,7 @@ static int unit_watch_pids_in_path(Unit *u, const char *path) {

                 while ((r = cg_read_subgroup(d, &fn)) > 0) {

                         _cleanup_free_ char *p = NULL;

-                        p = strjoin(path, "/", fn, NULL);

+                        p = strjoin(path, "/", fn);

                         free(fn);

                         if (!p)

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c

index 1a7f770db1..03f23780c1 100644

--- a/src/core/dbus-execute.c

+++ b/src/core/dbus-execute.c

@@ -1368,7 +1368,7 @@ int bus_exec_context_set_transient_property(

                         if (mode != UNIT_CHECK) {

                                 char *buf = NULL;

-                                buf = strjoin(b ? "-" : "", path, NULL);

+                                buf = strjoin(b ? "-" : "", path);

                                 if (!buf)

                                         return -ENOMEM;

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c

index 69e249c844..b6cb6e1350 100644

--- a/src/core/dbus-unit.c

+++ b/src/core/dbus-unit.c

@@ -481,7 +481,7 @@ int bus_unit_method_start_generic(

                 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Job mode %s invalid", smode);

         if (reload_if_possible)

-                verb = strjoin("reload-or-", job_type_to_string(job_type), NULL);

+                verb = strjoin("reload-or-", job_type_to_string(job_type));

         else

                 verb = strdup(job_type_to_string(job_type));

         if (!verb)

@@ -984,7 +984,7 @@ static int append_cgroup(sd_bus_message *reply, const char *p, Set *pids) {

                 if (r == 0)

                         break;

-                j = strjoin(p, "/", g, NULL);

+                j = strjoin(p, "/", g);

                 if (!j)

                         return -ENOMEM;

@@ -1363,7 +1363,7 @@ static int bus_unit_set_transient_property(

                                 if (r < 0)

                                         return r;

-                                label = strjoin(name, "-", other, NULL);

+                                label = strjoin(name, "-", other);

                                 if (!label)

                                         return -ENOMEM;

diff --git a/src/core/device.c b/src/core/device.c

index 4b9e84aeb6..425779d74f 100644

--- a/src/core/device.c

+++ b/src/core/device.c

@@ -239,7 +239,7 @@ static int device_update_description(Unit *u, struct udev_device *dev, const cha

                 if (label) {

                         _cleanup_free_ char *j;

-                        j = strjoin(model, " ", label, NULL);

+                        j = strjoin(model, " ", label);

                         if (j)

                                 r = unit_set_description(u, j);

                         else

diff --git a/src/core/execute.c b/src/core/execute.c

index 38cd486d82..224382b581 100644

--- a/src/core/execute.c

+++ b/src/core/execute.c

@@ -1603,7 +1603,7 @@ static int build_environment(

                 if (!joined)

                         return -ENOMEM;

-                x = strjoin("LISTEN_FDNAMES=", joined, NULL);

+                x = strjoin("LISTEN_FDNAMES=", joined);

                 if (!x)

                         return -ENOMEM;

                 our_env[n_env++] = x;

@@ -1710,7 +1710,7 @@ static int build_pass_environment(const ExecContext *c, char ***ret) {

                 v = getenv(*i);

                 if (!v)

                         continue;

-                x = strjoin(*i, "=", v, NULL);

+                x = strjoin(*i, "=", v);

                 if (!x)

                         return -ENOMEM;

                 if (!GREEDY_REALLOC(pass_env, n_bufsize, n_env + 2))

@@ -1924,7 +1924,7 @@ static int setup_runtime_directory(

         STRV_FOREACH(rt, context->runtime_directory) {

                 _cleanup_free_ char *p;

-                p = strjoin(params->runtime_prefix, "/", *rt, NULL);

+                p = strjoin(params->runtime_prefix, "/", *rt);

                 if (!p)

                         return -ENOMEM;

@@ -2000,7 +2000,7 @@ static int compile_read_write_paths(

         STRV_FOREACH(rt, context->runtime_directory) {

                 char *s;

-                s = strjoin(params->runtime_prefix, "/", *rt, NULL);

+                s = strjoin(params->runtime_prefix, "/", *rt);

                 if (!s)

                         return -ENOMEM;

@@ -3004,7 +3004,7 @@ int exec_context_destroy_runtime_directory(ExecContext *c, const char *runtime_p

         STRV_FOREACH(i, c->runtime_directory) {

                 _cleanup_free_ char *p;

-                p = strjoin(runtime_prefix, "/", *i, NULL);

+                p = strjoin(runtime_prefix, "/", *i);

                 if (!p)

                         return -ENOMEM;

diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c

index ccf61d29fb..fdd847ee8b 100644

--- a/src/core/locale-setup.c

+++ b/src/core/locale-setup.c

@@ -87,7 +87,7 @@ int locale_setup(char ***environment) {

                 if (!variables[i])

                         continue;

-                s = strjoin(locale_variable_to_string(i), "=", variables[i], NULL);

+                s = strjoin(locale_variable_to_string(i), "=", variables[i]);

                 if (!s) {

                         r = -ENOMEM;

                         goto finish;

diff --git a/src/core/manager.c b/src/core/manager.c

index 322e69a69c..e00e43a199 100644

--- a/src/core/manager.c

+++ b/src/core/manager.c

@@ -1196,7 +1196,7 @@ static void manager_build_unit_path_cache(Manager *m) {

                 FOREACH_DIRENT(de, d, r = -errno; goto fail) {

                         char *p;

-                        p = strjoin(streq(*i, "/") ? "" : *i, "/", de->d_name, NULL);

+                        p = strjoin(streq(*i, "/") ? "" : *i, "/", de->d_name);

                         if (!p) {

                                 r = -ENOMEM;

                                 goto fail;

diff --git a/src/core/namespace.c b/src/core/namespace.c

index 49a50c7b61..f5c0d42c05 100644

--- a/src/core/namespace.c

+++ b/src/core/namespace.c

@@ -940,7 +940,7 @@ static int setup_one_tmp_dir(const char *id, const char *prefix, char **path) {

         if (r < 0)

                 return r;

-        x = strjoin(prefix, "/systemd-private-", sd_id128_to_string(boot_id, bid), "-", id, "-XXXXXX", NULL);

+        x = strjoin(prefix, "/systemd-private-", sd_id128_to_string(boot_id, bid), "-", id, "-XXXXXX");

         if (!x)

                 return -ENOMEM;

diff --git a/src/core/service.c b/src/core/service.c

index a7274a758f..f6acc2f129 100644

--- a/src/core/service.c

+++ b/src/core/service.c

@@ -3273,7 +3273,7 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock, bool selinux_context

                 if (UNIT(s)->description) {

                         _cleanup_free_ char *a;

-                        a = strjoin(UNIT(s)->description, " (", peer, ")", NULL);

+                        a = strjoin(UNIT(s)->description, " (", peer, ")");

                         if (!a)

                                 return -ENOMEM;

diff --git a/src/core/timer.c b/src/core/timer.c

index 2469a517ea..c6b28dd9c5 100644

--- a/src/core/timer.c

+++ b/src/core/timer.c

@@ -147,7 +147,7 @@ static int timer_setup_persistent(Timer *t) {

                 e = getenv("XDG_DATA_HOME");

                 if (e)

-                        t->stamp_path = strjoin(e, "/systemd/timers/stamp-", UNIT(t)->id, NULL);

+                        t->stamp_path = strjoin(e, "/systemd/timers/stamp-", UNIT(t)->id);

                 else {

                         _cleanup_free_ char *h = NULL;

@@ -156,7 +156,7 @@ static int timer_setup_persistent(Timer *t) {

                         if (r < 0)

                                 return log_unit_error_errno(UNIT(t), r, "Failed to determine home directory: %m");

-                        t->stamp_path = strjoin(h, "/.local/share/systemd/timers/stamp-", UNIT(t)->id, NULL);

+                        t->stamp_path = strjoin(h, "/.local/share/systemd/timers/stamp-", UNIT(t)->id);

                 }

         }

diff --git a/src/core/unit.c b/src/core/unit.c

index e664e23892..fa1f3d9d4b 100644

--- a/src/core/unit.c

+++ b/src/core/unit.c

@@ -2510,7 +2510,7 @@ int unit_set_default_slice(Unit *u) {

                         return -ENOMEM;

                 if (MANAGER_IS_SYSTEM(u->manager))

-                        b = strjoin("system-", escaped, ".slice", NULL);

+                        b = strjoin("system-", escaped, ".slice");

                 else

                         b = strappend(escaped, ".slice");

                 if (!b)

@@ -3670,7 +3670,7 @@ int unit_make_transient(Unit *u) {

         if (!UNIT_VTABLE(u)->can_transient)

                 return -EOPNOTSUPP;

-        path = strjoin(u->manager->lookup_paths.transient, "/", u->id, NULL);

+        path = strjoin(u->manager->lookup_paths.transient, "/", u->id);

         if (!path)

                 return -ENOMEM;

diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c

index a982c204be..6bd0e925eb 100644

--- a/src/coredump/coredump.c

+++ b/src/coredump/coredump.c

@@ -729,7 +729,10 @@ static int submit_coredump(

                 r = coredump_make_stack_trace(coredump_fd, context[CONTEXT_EXE], &stacktrace);

                 if (r >= 0)

-                        core_message = strjoin("MESSAGE=Process ", context[CONTEXT_PID], " (", context[CONTEXT_COMM], ") of user ", context[CONTEXT_UID], " dumped core.\n\n", stacktrace, NULL);

+                        core_message = strjoin("MESSAGE=Process ", context[CONTEXT_PID],

+                                               " (", context[CONTEXT_COMM], ") of user ",

+                                               context[CONTEXT_UID], " dumped core.\n\n",

+                                               stacktrace);

                 else if (r == -EINVAL)

                         log_warning("Failed to generate stack trace: %s", dwfl_errmsg(dwfl_errno()));

                 else

@@ -741,7 +744,9 @@ static int submit_coredump(

         if (!core_message)

 #endif

 log:

-        core_message = strjoin("MESSAGE=Process ", context[CONTEXT_PID], " (", context[CONTEXT_COMM], ") of user ", context[CONTEXT_UID], " dumped core.", NULL);

+        core_message = strjoin("MESSAGE=Process ", context[CONTEXT_PID], " (",

+                               context[CONTEXT_COMM], ") of user ",

+                               context[CONTEXT_UID], " dumped core.");

         if (core_message)

                 IOVEC_SET_STRING(iovec[n_iovec++], core_message);

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c

index 0e5351e621..877bbb34fc 100644

--- a/src/coredump/coredumpctl.c

+++ b/src/coredump/coredumpctl.c

@@ -108,7 +108,7 @@ static int add_match(Set *set, const char *match) {

         else

                 prefix = "COREDUMP_COMM=";

-        pattern = strjoin(prefix, match, NULL);

+        pattern = strjoin(prefix, match);

         if (!pattern) {

                 r = -ENOMEM;

                 goto fail;

@@ -667,7 +667,7 @@ static int save_core(sd_journal *j, FILE *file, char **path, bool *unlink_temp)

                 if (r < 0)

                         return log_error_errno(r, "Failed to acquire temporary directory path: %m");

-                temp = strjoin(vt, "/coredump-XXXXXX", NULL);

+                temp = strjoin(vt, "/coredump-XXXXXX");

                 if (!temp)

                         return log_oom();

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c

index e2dc4327fe..68029865a0 100644

--- a/src/cryptsetup/cryptsetup-generator.c

+++ b/src/cryptsetup/cryptsetup-generator.c

@@ -86,7 +86,7 @@ static int create_disk(

         if (r < 0)

                 return log_error_errno(r, "Failed to generate unit name: %m");

-        p = strjoin(arg_dest, "/", n, NULL);

+        p = strjoin(arg_dest, "/", n);

         if (!p)

                 return log_oom();

@@ -188,7 +188,7 @@ static int create_disk(

         if (!noauto) {

-                to = strjoin(arg_dest, "/", d, ".wants/", n, NULL);

+                to = strjoin(arg_dest, "/", d, ".wants/", n);

                 if (!to)

                         return log_oom();

@@ -198,9 +198,9 @@ static int create_disk(

                 free(to);

                 if (!nofail)

-                        to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL);

+                        to = strjoin(arg_dest, "/cryptsetup.target.requires/", n);

                 else

-                        to = strjoin(arg_dest, "/cryptsetup.target.wants/", n, NULL);

+                        to = strjoin(arg_dest, "/cryptsetup.target.wants/", n);

                 if (!to)

                         return log_oom();

@@ -210,7 +210,7 @@ static int create_disk(

         }

         free(to);

-        to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);

+        to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n);

         if (!to)

                 return log_oom();

@@ -220,7 +220,7 @@ static int create_disk(

         if (!noauto && !nofail) {

                 _cleanup_free_ char *dmname;

-                dmname = strjoin("dev-mapper-", e, ".device", NULL);

+                dmname = strjoin("dev-mapper-", e, ".device");

                 if (!dmname)

                         return log_oom();

diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c

index 7f11ec724d..1ee3471355 100644

--- a/src/debug-generator/debug-generator.c

+++ b/src/debug-generator/debug-generator.c

@@ -113,7 +113,7 @@ static int generate_mask_symlinks(void) {

         STRV_FOREACH(u, arg_mask) {

                 _cleanup_free_ char *p = NULL;

-                p = strjoin(arg_dest, "/", *u, NULL);

+                p = strjoin(arg_dest, "/", *u);

                 if (!p)

                         return log_oom();

@@ -136,7 +136,7 @@ static int generate_wants_symlinks(void) {

         STRV_FOREACH(u, arg_wants) {

                 _cleanup_free_ char *p = NULL, *f = NULL;

-                p = strjoin(arg_dest, "/", arg_default_unit, ".wants/", *u, NULL);

+                p = strjoin(arg_dest, "/", arg_default_unit, ".wants/", *u);

                 if (!p)

                         return log_oom();

diff --git a/src/delta/delta.c b/src/delta/delta.c

index f32744def2..6848662ccb 100644

--- a/src/delta/delta.c

+++ b/src/delta/delta.c

@@ -214,7 +214,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const

         assert(!endswith(drop, "/"));

-        path = strjoin(toppath, "/", drop, NULL);

+        path = strjoin(toppath, "/", drop);

         if (!path)

                 return -ENOMEM;

@@ -242,7 +242,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const

                 if (!endswith(*file, ".conf"))

                         continue;

-                p = strjoin(path, "/", *file, NULL);

+                p = strjoin(path, "/", *file);

                 if (!p)

                         return -ENOMEM;

                 d = p + strlen(toppath) + 1;

@@ -330,7 +330,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch

                 if (!dirent_is_file(de))

                         continue;

-                p = strjoin(path, "/", de->d_name, NULL);

+                p = strjoin(path, "/", de->d_name);

                 if (!p)

                         return -ENOMEM;

@@ -383,7 +383,7 @@ static int process_suffix(const char *suffix, const char *onlyprefix) {

         NULSTR_FOREACH(p, prefixes) {

                 _cleanup_free_ char *t = NULL;

-                t = strjoin(p, "/", suffix, NULL);

+                t = strjoin(p, "/", suffix);

                 if (!t) {

                         r = -ENOMEM;

                         goto finish;

diff --git a/src/escape/escape.c b/src/escape/escape.c

index 9f39049577..af98c98e40 100644

--- a/src/escape/escape.c

+++ b/src/escape/escape.c

@@ -191,7 +191,7 @@ int main(int argc, char *argv[]) {

                         } else if (arg_suffix) {

                                 char *x;

-                                x = strjoin(e, ".", arg_suffix, NULL);

+                                x = strjoin(e, ".", arg_suffix);

                                 if (!x) {

                                         r = log_oom();

                                         goto finish;

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c

index e77bd71a52..46507de937 100644

--- a/src/fstab-generator/fstab-generator.c

+++ b/src/fstab-generator/fstab-generator.c

@@ -80,7 +80,7 @@ static int add_swap(

         if (r < 0)

                 return log_error_errno(r, "Failed to generate unit name: %m");

-        unit = strjoin(arg_dest, "/", name, NULL);

+        unit = strjoin(arg_dest, "/", name);

         if (!unit)

                 return log_oom();

@@ -275,7 +275,7 @@ static int add_mount(

         if (r < 0)

                 return log_error_errno(r, "Failed to generate unit name: %m");

-        unit = strjoin(arg_dest, "/", name, NULL);

+        unit = strjoin(arg_dest, "/", name);

         if (!unit)