X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev.h;h=fabe59d7d738d99e1fe590cad2233651b325df36;hp=e71f6b217ad59c0f907337a3877a0b7e9c1deb62;hb=98f10a9e2ada5d72a0c39b94a5b59d9da4f28753;hpb=c8e32461ccc2227da53f98ccd11bcb50d70929bd

diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h
index e71f6b217..fabe59d7d 100644
--- a/udev/lib/libudev.h
+++ b/udev/lib/libudev.h
@@ -28,11 +28,8 @@
 #error "#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE is needed to use this experimental library version"
 #endif
 
-struct udev;
-struct udev_device;
-struct udev_monitor;
-
 /* library context */
+struct udev;
 extern struct udev *udev_new(void);
 extern struct udev *udev_ref(struct udev *udev);
 extern void udev_unref(struct udev *udev);
@@ -47,15 +44,23 @@ 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);
+/* list iteration */
+struct udev_list_entry;
+extern struct udev_list_entry *udev_list_entry_get_next(struct udev_list_entry *list_entry);
+extern struct udev_list_entry *udev_list_entry_get_by_name(struct udev_list_entry *list_entry, const char *name);
+extern const char *udev_list_entry_get_name(struct udev_list_entry *list_entry);
+extern const char *udev_list_entry_get_value(struct udev_list_entry *list_entry);
+#define udev_list_entry_foreach(entry, first) \
+	for (entry = first; \
+	     entry != NULL; \
+	     entry = udev_list_entry_get_next(entry))
 
 /* sys devices */
+struct udev_device;
 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_get_parent_with_subsystem(struct udev_device *udev_device, const char *subsystem);
 extern struct udev_device *udev_device_ref(struct udev_device *udev_device);
 extern void udev_device_unref(struct udev_device *udev_device);
 extern struct udev *udev_device_get_udev(struct udev_device *udev_device);
@@ -64,26 +69,16 @@ 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_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device);
+extern struct udev_list_entry *udev_device_get_properties_list_entry(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);
 
-/* sys enumeration */
-extern int udev_enumerate_devices(struct udev *udev, const char *subsystem,
-				  int (*cb)(struct udev_device *udev_device, void *data),
-				  void *data);
-
 /* udev and kernel device events */
+struct udev_monitor;
 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);
@@ -93,4 +88,31 @@ extern struct udev *udev_monitor_get_udev(struct udev_monitor *udev_monitor);
 extern int udev_monitor_get_fd(struct udev_monitor *udev_monitor);
 extern struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monitor);
 
+/* sys enumeration */
+struct udev_enumerate;
+extern struct udev_enumerate *udev_enumerate_new(struct udev *udev);
+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 *udev_enumerate_get_udev(struct udev_enumerate *udev_enumerate);
+extern int udev_enumerate_add_match_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem);
+extern int udev_enumerate_add_nomatch_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem);
+extern int udev_enumerate_add_match_attr(struct udev_enumerate *udev_enumerate, const char *attr, const char *value);
+extern int udev_enumerate_add_nomatch_attr(struct udev_enumerate *udev_enumerate, const char *attr, const char *value);
+extern int udev_enumerate_add_syspath(struct udev_enumerate *udev_enumerate, const char *syspath);
+extern int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate);
+extern int udev_enumerate_scan_subsystems(struct udev_enumerate *udev_enumerate);
+extern struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *udev_enumerate);
+
+/* event queue */
+struct udev_queue;
+extern struct udev_queue *udev_queue_new(struct udev *udev);
+extern struct udev_queue *udev_queue_ref(struct udev_queue *udev_queue);
+extern void udev_queue_unref(struct udev_queue *udev_queue);
+extern struct udev *udev_queue_get_udev(struct udev_queue *udev_queue);
+extern unsigned long long int udev_queue_get_kernel_seqnum(struct udev_queue *udev_queue);
+extern unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue *udev_queue);
+extern int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue);
+extern int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned long long int seqnum);
+extern struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev_queue);
+extern struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev_queue);
 #endif