X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev.h;h=28a37af1780a556e2ab9682ba00403426c752993;hb=e345e2670a8c17f5e1145cc554b7a7646e271032;hp=1970652f8fbfe0fa5d95e813e79d6eb1b180595e;hpb=fb762bb928772f1923fef1e342d8ebca9bf7691f;p=elogind.git

diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h
index 1970652f8..28a37af17 100644
--- a/udev/lib/libudev.h
+++ b/udev/lib/libudev.h
@@ -29,6 +29,12 @@
 #endif
 
 struct udev;
+struct udev_list;
+struct udev_device;
+struct udev_enumerate;
+struct udev_monitor;
+
+/* library context */
 extern struct udev *udev_new(void);
 extern struct udev *udev_ref(struct udev *udev);
 extern void udev_unref(struct udev *udev);
@@ -40,12 +46,22 @@ extern int udev_get_log_priority(struct udev *udev);
 extern void udev_set_log_priority(struct udev *udev, int priority);
 extern const char *udev_get_sys_path(struct udev *udev);
 extern const char *udev_get_dev_path(struct udev *udev);
+extern void *udev_get_userdata(struct udev *udev);
+extern void udev_set_userdata(struct udev *udev, void *userdata);
+
+/* selinux glue */
 extern void udev_selinux_resetfscreatecon(struct udev *udev);
 extern void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
 extern void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
 
-struct udev_device;
+/* list iteration */
+extern struct udev_list *udev_list_entry_get_next(struct udev_list *list_entry);
+extern const char *udev_list_entry_get_name(struct udev_list *list_entry);
+extern const char *udev_list_entry_get_value(struct udev_list *list_entry);
+
+/* sys devices */
 extern struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *syspath);
+extern struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, dev_t devnum);
 extern struct udev_device *udev_device_get_parent(struct udev_device *udev_device);
 extern struct udev_device *udev_device_ref(struct udev_device *udev_device);
 extern void udev_device_unref(struct udev_device *udev_device);
@@ -55,25 +71,21 @@ extern const char *udev_device_get_subsystem(struct udev_device *udev_device);
 extern const char *udev_device_get_syspath(struct udev_device *udev_device);
 extern const char *udev_device_get_sysname(struct udev_device *udev_device);
 extern const char *udev_device_get_devnode(struct udev_device *udev_device);
-extern int udev_device_get_devlinks(struct udev_device *udev_device,
-				    int (*cb)(struct udev_device *udev_device,
-					      const char *value, void *data),
-				    void *data);
-extern int udev_device_get_properties(struct udev_device *udev_device,
-				      int (*cb)(struct udev_device *udev_device,
-						const char *key, const char *value, void *data),
-				      void *data);
+extern struct udev_list *udev_device_get_devlinks_list(struct udev_device *udev_device);
+extern struct udev_list *udev_device_get_properties_list(struct udev_device *udev_device);
 extern const char *udev_device_get_driver(struct udev_device *udev_device);
 extern dev_t udev_device_get_devnum(struct udev_device *udev_device);
 extern const char *udev_device_get_action(struct udev_device *udev_device);
 extern unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device);
 extern const char *udev_device_get_attr_value(struct udev_device *udev_device, const char *attr);
 
-extern int udev_enumerate_devices(struct udev *udev, const char *subsystem,
-				  int (*cb)(struct udev_device *udev_device, void *data),
-				  void *data);
+/* sys enumeration */
+extern struct udev_enumerate *udev_enumerate_new_from_subsystems(struct udev *udev, const char *subsystem);
+extern struct udev_enumerate *udev_enumerate_ref(struct udev_enumerate *udev_enumerate);
+extern void udev_enumerate_unref(struct udev_enumerate *udev_enumerate);
+extern struct udev_list *udev_enumerate_get_list(struct udev_enumerate *udev_enumerate);
 
-struct udev_monitor;
+/* udev and kernel device events */
 extern struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
 extern struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev);
 extern int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor);