Merge pull request #12836 from yuwata/tree-wide-replace-strjoin

tree-wide: replace strjoin() with path_join()

diff --cc src/basic/cgroup-util.c
Simple merge

diff --cc src/basic/conf-files.c
Simple merge

diff --cc src/basic/path-util.c
Simple merge

diff --cc src/core/cgroup.c
Simple merge

diff --cc src/delta/delta.c
index 08d8867,8d121b9..b910074
--- 1/src/delta/delta.c
--- 2/src/delta/delta.c
+++ b/src/delta/delta.c
@@@ -429,10 -423,10 +429,10 @@@ static int process_suffix(const char *s
          NULSTR_FOREACH(p, prefixes) {
                  _cleanup_free_ char *t = NULL;
  
 -                if (should_skip_path(p, suffix))
 +                if (should_skip_path(p, suffix) > 0)
                          continue;
  
-                 t = strjoin(p, "/", suffix);
+                 t = path_join(p, suffix);
                  if (!t) {
                          r = -ENOMEM;
                          goto finish;

diff --cc src/libsystemd/sd-device/sd-device.c
Simple merge

diff --cc src/nspawn/nspawn-mount.c
Simple merge

diff --cc src/nspawn/nspawn.c
Simple merge

diff --cc src/shared/install.c
Simple merge

diff --cc src/shared/path-lookup.c
Simple merge