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

sd-device: make sd_device_get_is_initialized() returns is_initialized by return value

Browse Source
This commit is contained in:
Yu Watanabe
2018-10-29 17:33:33 +09:00
parent 78ffb476f2
commit 5a937ea2f6
9 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rfkill/rfkill.c
+3 -3
View File
@@ -111,12 +111,12 @@ static int wait_for_initialized(
_cleanup_(sd_event_unrefp) sd_event *event = NULL;
_cleanup_(sd_device_unrefp) sd_device *d = NULL;
struct DeviceMonitorData data = {};
int initialized, r;
int r;
assert(device);
assert(ret);
if (sd_device_get_is_initialized(device, &initialized) >= 0 && initialized) {
if (sd_device_get_is_initialized(device) > 0) {
*ret = sd_device_ref(device);
return 0;
}
@@ -152,7 +152,7 @@ static int wait_for_initialized(
return log_full_errno(IN_SET(r, -ENOENT, -ENXIO, -ENODEV) ? LOG_DEBUG : LOG_ERR, r,
"Failed to open device '%s': %m", data.sysname);
if (sd_device_get_is_initialized(d, &initialized) >= 0 && initialized) {
if (sd_device_get_is_initialized(d) > 0) {
*ret = TAKE_PTR(d);
return 0;
}