From 6e25642f8e33d6f304fcf68efd6517d29fc23e5c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 9 Mar 2021 14:31:39 +0900 Subject: [PATCH] sd-device: drop sysname_set flag When device_set_sysname() succeeds, sysname is always set. --- src/libsystemd/sd-device/device-internal.h | 1 - src/libsystemd/sd-device/sd-device.c | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/libsystemd/sd-device/device-internal.h b/src/libsystemd/sd-device/device-internal.h index 6776ab3aa76..73412db5de9 100644 --- a/src/libsystemd/sd-device/device-internal.h +++ b/src/libsystemd/sd-device/device-internal.h @@ -84,7 +84,6 @@ struct sd_device { bool property_tags_outdated:1; /* need to update TAGS= or CURRENT_TAGS= property */ bool property_devlinks_outdated:1; /* need to update DEVLINKS= property */ bool properties_buf_outdated:1; /* need to reread hashmap */ - bool sysname_set:1; /* don't reread sysname */ bool subsystem_set:1; /* don't reread subsystem */ bool driver_subsystem_set:1; /* don't reread subsystem */ bool driver_set:1; /* don't reread driver */ diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index fbb5debff4a..c51d6bffb06 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -986,7 +986,7 @@ _public_ int sd_device_get_devname(sd_device *device, const char **devname) { return 0; } -static int device_set_sysname(sd_device *device) { +static int device_set_sysname_and_sysnum(sd_device *device) { _cleanup_free_ char *sysname = NULL; const char *sysnum = NULL; const char *pos; @@ -1023,7 +1023,6 @@ static int device_set_sysname(sd_device *device) { if (len == 0) sysnum = NULL; - device->sysname_set = true; device->sysnum = sysnum; return free_and_replace(device->sysname, sysname); } @@ -1033,14 +1032,12 @@ _public_ int sd_device_get_sysname(sd_device *device, const char **ret) { assert_return(device, -EINVAL); - if (!device->sysname_set) { - r = device_set_sysname(device); + if (!device->sysname) { + r = device_set_sysname_and_sysnum(device); if (r < 0) return r; } - assert_return(device->sysname, -ENOENT); - if (ret) *ret = device->sysname; return 0; @@ -1051,8 +1048,8 @@ _public_ int sd_device_get_sysnum(sd_device *device, const char **ret) { assert_return(device, -EINVAL); - if (!device->sysname_set) { - r = device_set_sysname(device); + if (!device->sysname) { + r = device_set_sysname_and_sysnum(device); if (r < 0) return r; } -- 2.47.3