From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 22 Jun 2019 18:02:46 +0000 (+0200)
Subject: Merge pull request #12836 from yuwata/tree-wide-replace-strjoin
X-Git-Tag: v243-rc1~250
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cee97d57687e93e07a8ee36edf0e0d0f3317fccc;p=thirdparty%2Fsystemd.git

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

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

cee97d57687e93e07a8ee36edf0e0d0f3317fccc
diff --cc src/delta/delta.c
index 08d8867431d,8d121b969ae..b9100749649
--- a/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;