From 827f86506391acbc9ba3278d319fca1ab8fee70e Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 8 Mar 2022 14:24:48 +0900 Subject: [PATCH] sd-device: shorten code a bit --- src/libsystemd/sd-device/device-private.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c index 8eb7198808..c383833740 100644 --- a/src/libsystemd/sd-device/device-private.c +++ b/src/libsystemd/sd-device/device-private.c @@ -1029,18 +1029,9 @@ int device_update_db(sd_device *device) { * set 'sticky' bit to indicate that we should not clean the * database when we transition from initramfs to the real root */ - if (device->db_persist) { - r = fchmod(fileno(f), 01644); - if (r < 0) { - r = -errno; - goto fail; - } - } else { - r = fchmod(fileno(f), 0644); - if (r < 0) { - r = -errno; - goto fail; - } + if (fchmod(fileno(f), device->db_persist ? 01644 : 0644) < 0) { + r = -errno; + goto fail; } if (has_info) { @@ -1077,8 +1068,7 @@ int device_update_db(sd_device *device) { if (r < 0) goto fail; - r = rename(path_tmp, path); - if (r < 0) { + if (rename(path_tmp, path) < 0) { r = -errno; goto fail; } -- 2.25.1