shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-21 18:03:41 +03:00
Code

udev-util: minor cleanups for on_ac_power()

Browse Source 
Follow-ups for #24420.
This commit is contained in:
Yu Watanabe 2022-08-27 15:44:17 +09:00 committed by Luca Boccassi
parent 704b0d8464
commit 8676bdb708
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/shared/udev-util.c
View File

@ -702,13 +702,13 @@ int on_ac_power(void) {
} }
} }
bool is_battery = streq(val, "Battery"); if (streq(val, "Battery")) {
if (is_battery) {
r = sd_device_get_sysattr_value(d, "scope", &val); r = sd_device_get_sysattr_value(d, "scope", &val);
if (r < 0) if (r < 0) {
log_device_debug_errno(d, r, "Failed to read 'scope' sysfs attribute, ignoring: %m"); if (r != -ENOENT)
else if (streq(val, "Device")) { log_device_debug_errno(d, r, "Failed to read 'scope' sysfs attribute, ignoring: %m");
log_device_debug(d, "The power supply is a device battery, ignoring."); } else if (streq(val, "Device")) {
log_device_debug(d, "The power supply is a device battery, ignoring device.");
continue; continue;
} }
@ -719,7 +719,7 @@ int on_ac_power(void) {
r = device_get_sysattr_unsigned(d, "online", NULL); r = device_get_sysattr_unsigned(d, "online", NULL);
if (r < 0) { if (r < 0) {
log_device_debug_errno(d, r, "Failed to query 'online' sysfs attribute: %m"); log_device_debug_errno(d, r, "Failed to query 'online' sysfs attribute, ignoring device: %m");
continue; continue;
} else if (r > 0) /* At least 1 and 2 are defined as different types of 'online' */ } else if (r > 0) /* At least 1 and 2 are defined as different types of 'online' */
found_ac_online = true; found_ac_online = true;