libudev: more list rework

[elogind.git] / udev / lib / libudev.h

diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h
index e71f6b217ad59c0f907337a3877a0b7e9c1deb62..25b5f9c02ac2221ef92ad7cdd3285b8f2a8ffd13 100644 (file)
--- 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);
@@ -52,7 +49,18 @@ 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 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);
@@ -64,26 +72,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 +91,11 @@ 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_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_entry *udev_enumerate_get_list_entry(struct udev_enumerate *udev_enumerate);
+
 #endif