SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-device: drop sysname_set flag

Browse Source 
When device_set_sysname() succeeds, sysname is always set.
This commit is contained in:
Yu Watanabe
2021-04-30 19:21:18 +09:00
parent ff7a8d2938
commit 6e25642f8e
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-device/device-internal.h
-1
View File
@@ -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 */
src/libsystemd/sd-device/sd-device.c
+5 -8
View File
@@ -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;
}