diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-06-22 20:02:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-22 20:02:46 +0200 |
| commit | cee97d57687e93e07a8ee36edf0e0d0f3317fccc (patch) | |
| tree | 7278ba990e750ae119cacfd6c19a0866579374ab /src/libsystemd/sd-bus | |
| parent | 4c1567f29aeb60a6741874bca8a8e3a0bd69ed01 (diff) | |
| parent | a13de89d361e830f603f25011896e94d5256299d (diff) | |
| download | systemd-cee97d57687e93e07a8ee36edf0e0d0f3317fccc.tar.gz | |
Merge pull request #12836 from yuwata/tree-wide-replace-strjoin
tree-wide: replace strjoin() with path_join()
Diffstat (limited to 'src/libsystemd/sd-bus')
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 1c25ba9dea..978a505610 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -36,6 +36,7 @@ #include "memory-util.h" #include "missing.h" #include "parse-util.h" +#include "path-util.h" #include "process-util.h" #include "string-util.h" #include "strv.h" @@ -3756,7 +3757,7 @@ _public_ int sd_bus_path_encode(const char *prefix, const char *external_id, cha if (!e) return -ENOMEM; - ret = strjoin(prefix, "/", e); + ret = path_join(prefix, e); if (!ret) return -ENOMEM; |