diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-04-21 12:34:37 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-04-21 12:41:15 +0200 |
| commit | 67458536afcdceb25b63b8367837ab5402f3983e (patch) | |
| tree | 151dd10f3a6ea5766ce393594e0d09c0a6739d1f /src/libsystemd | |
| parent | 21453b8b4bfb4d1fa3efd1df3fe1208d48cbd41b (diff) | |
| download | systemd-67458536afcdceb25b63b8367837ab5402f3983e.tar.gz | |
tree-wide: convert more cases do DEVNUM_FORMAT_STR()/DEVNUM_FORMAT_VAL()
Let's use our nice macros a bit more.
(Not comprehensive)
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-device/sd-device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index e2eac651bd..2c7b97ab4d 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -301,7 +301,7 @@ int device_new_from_mode_and_devnum(sd_device **ret, mode_t mode, dev_t devnum) if (major(devnum) == 0) return -ENODEV; - if (asprintf(&syspath, "/sys/dev/%s/%u:%u", t, major(devnum), minor(devnum)) < 0) + if (asprintf(&syspath, "/sys/dev/%s/" DEVNUM_FORMAT_STR, t, DEVNUM_FORMAT_VAL(devnum)) < 0) return -ENOMEM; r = sd_device_new_from_syspath(&dev, syspath); @@ -1654,9 +1654,9 @@ int device_get_device_id(sd_device *device, const char **ret) { if (sd_device_get_devnum(device, &devnum) >= 0) { /* use dev_t — b259:131072, c254:0 */ - if (asprintf(&id, "%c%u:%u", + if (asprintf(&id, "%c" DEVNUM_FORMAT_STR, streq(subsystem, "block") ? 'b' : 'c', - major(devnum), minor(devnum)) < 0) + DEVNUM_FORMAT_VAL(devnum)) < 0) return -ENOMEM; } else if (sd_device_get_ifindex(device, &ifindex) >= 0) { /* use netdev ifindex — n3 */ |