From 1937f5105d375ba3fbf7fa65366e6435d6b36b5a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 26 Aug 2024 04:01:47 +0900 Subject: [PATCH] sd-device: make sd_device_get_devtype() return 0 on success again This partially reverts the commit 730b76bd2cd5f0866baa738ae283e3b62544a28f. Before the commit, the function returned 0 on success, but the commit made the function always return 1, as if device->devtype is NULL, the function returns -ENOENT in the above. Fortunately, udev_device_get_devtype() does not propagate any non-negative value from sd_device_get_devtype(). Hence, hopefully we can safely revert the change. --- src/libsystemd/sd-device/sd-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index d8d151835c0..dafda626f07 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -1211,7 +1211,7 @@ _public_ int sd_device_get_devtype(sd_device *device, const char **devtype) { if (devtype) *devtype = device->devtype; - return !!device->devtype; + return 0; } _public_ int sd_device_get_parent_with_subsystem_devtype(sd_device *device, const char *subsystem, const char *devtype, sd_device **ret) {