chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libudev: handle "device" link as parent, handle "class" "block" as "subsystem"
[elogind.git]
/
udev
/
lib
/
libudev-monitor.c
diff --git
a/udev/lib/libudev-monitor.c
b/udev/lib/libudev-monitor.c
index 3e1731e38223948b9f99503ee65f99f3ba54227b..8e9cf2d0eb5ef934272dd39e6418c95a6e939a7f 100644
(file)
--- a/
udev/lib/libudev-monitor.c
+++ b/
udev/lib/libudev-monitor.c
@@
-33,7
+33,6
@@
#include "libudev.h"
#include "libudev-private.h"
#include "libudev.h"
#include "libudev-private.h"
-#include "../udev.h"
struct udev_monitor {
struct udev *udev;
struct udev_monitor {
struct udev *udev;
@@
-337,7
+336,7
@@
struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
} else if (strncmp(key, "TIMEOUT=", 8) == 0) {
device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
}
} else if (strncmp(key, "TIMEOUT=", 8) == 0) {
device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
}
- device_add_property(udev_device, key);
+ device_add_property
_from_string
(udev_device, key);
}
device_set_devnum(udev_device, makedev(maj, min));
}
device_set_devnum(udev_device, makedev(maj, min));