diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-21 03:07:01 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-21 03:26:16 +0900 |
| commit | 657ee2d82b73818d0ee8c3c5962c1cb2dbd52b76 (patch) | |
| tree | 3624791030beb2dfd75b654f24cf818a1c6444e2 /src/libsystemd/sd-device | |
| parent | f9dc94408d70dd2f44915f4c6d67dc498c1c6243 (diff) | |
| download | systemd-657ee2d82b73818d0ee8c3c5962c1cb2dbd52b76.tar.gz systemd-657ee2d82b73818d0ee8c3c5962c1cb2dbd52b76.tar.bz2 systemd-657ee2d82b73818d0ee8c3c5962c1cb2dbd52b76.zip | |
tree-wide: replace strjoin() with path_join()
Diffstat (limited to 'src/libsystemd/sd-device')
| -rw-r--r-- | src/libsystemd/sd-device/device-enumerator.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-device/sd-device.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c index 4357860170..5b54641213 100644 --- a/src/libsystemd/sd-device/device-enumerator.c +++ b/src/libsystemd/sd-device/device-enumerator.c @@ -752,7 +752,7 @@ static int parent_crawl_children(sd_device_enumerator *enumerator, const char *p if (dent->d_type != DT_DIR) continue; - child = strjoin(path, "/", dent->d_name); + child = path_join(path, dent->d_name); if (!child) return -ENOMEM; diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index c2315c03fe..eee99fa517 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -167,7 +167,7 @@ int device_set_syspath(sd_device *device, const char *_syspath, bool verify) { "sd-device: Canonicalized path '%s' does not starts with sysfs mount point '%s'", syspath, real_sys); - new_syspath = strjoin("/sys/", p); + new_syspath = path_join("/sys", p); if (!new_syspath) return -ENOMEM; |