From c8ad151a5836631f17a5912e2e031e1896aa3cac Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Jun 2021 10:36:53 +0200 Subject: [PATCH] pid1: make return value of device_remove_old() void too --- src/core/device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/core/device.c b/src/core/device.c index 84898d72363..d188b0cd222 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -889,27 +889,24 @@ static void device_propagate_reload_by_sysfs(Manager *m, const char *sysfs) { } } -static int device_remove_old(Manager *m, sd_device *dev) { +static void device_remove_old_on_move(Manager *m, sd_device *dev) { _cleanup_free_ char *syspath_old = NULL, *e = NULL; const char *devpath_old; int r; r = sd_device_get_property_value(dev, "DEVPATH_OLD", &devpath_old); - if (r < 0) { - log_device_debug_errno(dev, r, "Failed to get DEVPATH_OLD= property on 'move' uevent, ignoring: %m"); - return 0; - } + if (r < 0) + return (void) log_device_debug_errno(dev, r, "Failed to get DEVPATH_OLD= property on 'move' uevent, ignoring: %m"); syspath_old = path_join("/sys", devpath_old); if (!syspath_old) - return log_oom(); + return (void) log_oom(); r = unit_name_from_path(syspath_old, ".device", &e); if (r < 0) - return log_device_error_errno(dev, r, "Failed to generate unit name from old device path: %m"); + return (void) log_device_error_errno(dev, r, "Failed to generate unit name from old device path: %m"); device_update_found_by_sysfs(m, syspath_old, 0, DEVICE_FOUND_UDEV|DEVICE_FOUND_MOUNT|DEVICE_FOUND_SWAP); - return 0; } static int device_dispatch_io(sd_device_monitor *monitor, sd_device *dev, void *userdata) { @@ -937,7 +934,7 @@ static int device_dispatch_io(sd_device_monitor *monitor, sd_device *dev, void * device_propagate_reload_by_sysfs(m, sysfs); if (action == SD_DEVICE_MOVE) - (void) device_remove_old(m, dev); + device_remove_old_on_move(m, dev); /* A change event can signal that a device is becoming ready, in particular if the device is using * the SYSTEMD_READY logic in udev so we need to reach the else block of the following if, even for -- 2.47.3