-extern ssize_t util_get_sys_subsystem(struct udev *udev, const char *devpath, char *subsystem, size_t size);
-extern ssize_t util_get_sys_driver(struct udev *udev, const char *devpath, char *driver, size_t size);
-extern int util_resolve_sys_link(struct udev *udev, char *devpath, size_t size);
-extern struct util_name_entry *util_name_list_add(struct udev *udev, struct list_head *name_list,
- const char *name, const char *value, int sort);
-extern void util_name_list_cleanup(struct udev *udev, struct list_head *name_list);
+extern void udev_list_init(struct udev_list_node *list);
+extern int udev_list_is_empty(struct udev_list_node *list);
+extern void udev_list_node_append(struct udev_list_node *new, struct udev_list_node *list);
+extern void udev_list_node_remove(struct udev_list_node *entry);
+#define udev_list_node_foreach(node, list) \
+ for (node = (list)->next; \
+ node != list; \
+ node = (node)->next)
+#define udev_list_node_foreach_safe(node, tmp, list) \
+ for (node = (list)->next, tmp = (node)->next; \
+ node != list; \
+ node = tmp, tmp = (tmp)->next)
+extern struct udev_list_entry *udev_list_entry_add(struct udev *udev, struct udev_list_node *list,
+ const char *name, const char *value,
+ int unique, int sort);
+extern void udev_list_entry_delete(struct udev_list_entry *entry);
+extern void udev_list_entry_remove(struct udev_list_entry *entry);
+extern void udev_list_entry_insert_before(struct udev_list_entry *new, struct udev_list_entry *entry);
+extern void udev_list_entry_append(struct udev_list_entry *new, struct udev_list_node *list);
+extern void udev_list_cleanup_entries(struct udev *udev, struct udev_list_node *name_list);
+extern struct udev_list_entry *udev_list_get_entry(struct udev_list_node *list);
+extern int udev_list_entry_get_flag(struct udev_list_entry *list_entry);
+extern void udev_list_entry_set_flag(struct udev_list_entry *list_entry, int flag);
+#define udev_list_entry_foreach_safe(entry, tmp, first) \
+ for (entry = first, tmp = udev_list_entry_get_next(entry); \
+ entry != NULL; \
+ entry = tmp, tmp = udev_list_entry_get_next(tmp))
+
+/* libudev-queue */
+extern int udev_queue_export_udev_seqnum(struct udev_queue *udev_queue, unsigned long long int seqnum);
+extern int udev_queue_export_device_queued(struct udev_queue *udev_queue, struct udev_device *udev_device);
+extern int udev_queue_export_device_finished(struct udev_queue *udev_queue, struct udev_device *udev_device);
+extern int udev_queue_export_device_failed(struct udev_queue *udev_queue, struct udev_device *udev_device);
+
+/* libudev-utils */
+#define UTIL_PATH_SIZE 1024
+#define UTIL_LINE_SIZE 2048
+#define UTIL_NAME_SIZE 512
+#define UDEV_ALLOWED_CHARS_INPUT "/ $%?,"
+extern ssize_t util_get_sys_subsystem(struct udev *udev, const char *syspath, char *subsystem, size_t size);
+extern ssize_t util_get_sys_driver(struct udev *udev, const char *syspath, char *driver, size_t size);
+extern int util_resolve_sys_link(struct udev *udev, char *syspath, size_t size);