chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus-proxy: ECONNRESET/ENOTCONN can hit us on every step, hence handle it on every...
[elogind.git]
/
src
/
udev
/
udev-event.c
diff --git
a/src/udev/udev-event.c
b/src/udev/udev-event.c
index e5b2259fda1aa7806329287789201068e19f87fd..bc115f112d7c56c01ab59b7e11f25f353d400bc8 100644
(file)
--- a/
src/udev/udev-event.c
+++ b/
src/udev/udev-event.c
@@
-26,7
+26,7
@@
#include <time.h>
#include <net/if.h>
#include <sys/prctl.h>
#include <time.h>
#include <net/if.h>
#include <sys/prctl.h>
-#include <
sys/
poll.h>
+#include <poll.h>
#include <sys/epoll.h>
#include <sys/wait.h>
#include <sys/signalfd.h>
#include <sys/epoll.h>
#include <sys/wait.h>
#include <sys/signalfd.h>
@@
-809,11
+809,8
@@
void udev_event_execute_rules(struct udev_event *event,
if (major(udev_device_get_devnum(dev)) != 0)
udev_node_remove(dev);
} else {
if (major(udev_device_get_devnum(dev)) != 0)
udev_node_remove(dev);
} else {
- event->dev_db = udev_device_
new(event->u
dev);
+ event->dev_db = udev_device_
shallow_clone(
dev);
if (event->dev_db != NULL) {
if (event->dev_db != NULL) {
- udev_device_set_syspath(event->dev_db, udev_device_get_syspath(dev));
- udev_device_set_subsystem(event->dev_db, udev_device_get_subsystem(dev));
- udev_device_set_devnum(event->dev_db, udev_device_get_devnum(dev));
udev_device_read_db(event->dev_db, NULL);
udev_device_set_info_loaded(event->dev_db);
udev_device_read_db(event->dev_db, NULL);
udev_device_set_info_loaded(event->dev_db);
@@
-833,7
+830,7
@@
void udev_event_execute_rules(struct udev_event *event,
key = udev_list_entry_get_name(entry);
value = udev_list_entry_get_value(entry);
key = udev_list_entry_get_name(entry);
value = udev_list_entry_get_value(entry);
- property = udev_device_add_property(
event->
dev, key, value);
+ property = udev_device_add_property(dev, key, value);
udev_list_entry_set_num(property, true);
}
}
udev_list_entry_set_num(property, true);
}
}