diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-30 10:40:38 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-30 10:40:38 +0100 |
commit | 30016f21b36599a0c5c563f165db48ddb32d6521 (patch) | |
tree | 094a167b640b03c791f9764ca9c6a7d329aa8772 /src/udev | |
parent | b2ac2b01c8ddaabbe63bcb7168dd752f44320d86 (diff) | |
download | systemd-30016f21b36599a0c5c563f165db48ddb32d6521.tar.gz |
tree-wide: replace path_join with path_join_many
Diffstat (limited to 'src/udev')
-rw-r--r-- | src/udev/udev-event.c | 2 | ||||
-rw-r--r-- | src/udev/udev-node.c | 4 | ||||
-rw-r--r-- | src/udev/udevadm-trigger.c | 2 | ||||
-rw-r--r-- | src/udev/udevadm-util.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index c60c02e7fe..b5252926cd 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -633,7 +633,7 @@ int udev_event_spawn(struct udev_event *event, if (!path_is_absolute(argv[0])) { char *program; - program = path_join(NULL, UDEVLIBEXECDIR, argv[0]); + program = path_join_many(UDEVLIBEXECDIR, argv[0]); if (!program) return log_oom(); diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 648a102265..a12dbcfc44 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -200,10 +200,10 @@ static int link_update(sd_device *dev, const char *slink, bool add) { return log_device_debug_errno(dev, r, "Failed to get id_filename: %m"); util_path_encode(slink + STRLEN("/dev"), name_enc, sizeof(name_enc)); - dirname = path_join(NULL, "/run/udev/links/", name_enc); + dirname = path_join_many("/run/udev/links/", name_enc); if (!dirname) return log_oom(); - filename = path_join(NULL, dirname, id_filename); + filename = path_join_many(dirname, id_filename); if (!filename) return log_oom(); diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c index 38035b5c92..14fb241a29 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c @@ -35,7 +35,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se if (arg_dry_run) continue; - filename = path_join(NULL, syspath, "uevent"); + filename = path_join_many(syspath, "uevent"); if (!filename) return log_oom(); diff --git a/src/udev/udevadm-util.c b/src/udev/udevadm-util.c index 1dbcf979b1..22f43740c3 100644 --- a/src/udev/udevadm-util.c +++ b/src/udev/udevadm-util.c @@ -14,7 +14,7 @@ int find_device(const char *id, const char *prefix, sd_device **ret) { assert(ret); if (prefix && !path_startswith(id, prefix)) { - buf = path_join(NULL, prefix, id); + buf = path_join_many(prefix, id); if (!buf) return -ENOMEM; id = buf; |