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

udev: drop unnecessary checks

Browse Source 
Also, drop one unnecessary sd_device_unref(), as dev_db_clone will be
unref()ed in udev_event_free().
This commit is contained in:
Yu Watanabe
2020-07-21 11:55:28 +09:00
parent ae353ec2f6
commit 28266c446a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-event.c
+3 -7
View File
@@ -881,8 +881,7 @@ static int update_devnode(UdevEvent *event) {
return log_device_error_errno(dev, r, "Failed to get devnum: %m");
/* remove/update possible left-over symlinks from old database entry */
if (event->dev_db_clone)
(void) udev_node_update_old_links(dev, event->dev_db_clone);
(void) udev_node_update_old_links(dev, event->dev_db_clone);
if (!uid_is_valid(event->uid)) {
r = device_get_devnode_uid(dev, &event->uid);
@@ -945,8 +944,7 @@ static int udev_event_on_move(UdevEvent *event) {
sd_device *dev = event->dev;
int r;
if (event->dev_db_clone &&
sd_device_get_devnum(dev, NULL) < 0) {
if (sd_device_get_devnum(dev, NULL) < 0) {
r = device_copy_properties(dev, event->dev_db_clone);
if (r < 0)
log_device_debug_errno(dev, r, "Failed to copy properties from cloned sd_device object, ignoring: %m");
@@ -992,7 +990,7 @@ int udev_event_execute_rules(UdevEvent *event,
if (r < 0)
return log_device_debug_errno(dev, r, "Failed to clone sd_device object: %m");
if (event->dev_db_clone && sd_device_get_devnum(dev, NULL) >= 0)
if (sd_device_get_devnum(dev, NULL) >= 0)
/* Disable watch during event processing. */
(void) udev_watch_end(event->dev_db_clone);
@@ -1030,8 +1028,6 @@ int udev_event_execute_rules(UdevEvent *event,
device_set_is_initialized(dev);
event->dev_db_clone = sd_device_unref(event->dev_db_clone);
return 0;
}