fix list handling in enumerate and rules file sorting

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

diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h
index 6e419dff6c6c3d9419216bf33c9ac5b88aa22394..2f8b8259b5ffa7d07e4846fe6c18b536d873102b 100644 (file)
--- a/udev/lib/libudev-private.h
+++ b/udev/lib/libudev-private.h
@@ -23,6 +23,8 @@
 #include <syslog.h>
 #include "libudev.h"
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
 static inline void __attribute__ ((format(printf, 2, 3)))
 udev_log_null(struct udev *udev, const char *format, ...) {}
 
@@ -48,14 +50,21 @@ void udev_log(struct udev *udev,
 extern struct udev_device *device_new(struct udev *udev);
 extern const char *udev_get_rules_path(struct udev *udev);
 extern int udev_get_run(struct udev *udev);
+extern struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value);
+extern struct udev_list_entry *udev_get_properties_list_entry(struct udev *udev);
 
 /* libudev-device */
 extern int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath);
 extern int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem);
 extern int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode);
 extern int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink);
-extern int udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value);
-extern int udev_device_add_property_from_string(struct udev_device *udev_device, const char *property);
+extern void udev_device_cleanup_devlinks_list(struct udev_device *udev_device);
+extern struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value);
+extern struct udev_list_entry *udev_device_add_property_from_string(struct udev_device *udev_device, const char *property);
+extern char **udev_device_get_properties_envp(struct udev_device *udev_device);
+extern ssize_t udev_device_get_properties_monitor_buf(struct udev_device *udev_device, const char **buf);
+extern int udev_device_read_db(struct udev_device *udev_device);
+extern int udev_device_read_uevent_file(struct udev_device *udev_device);
 extern int udev_device_set_action(struct udev_device *udev_device, const char *action);
 extern int udev_device_set_driver(struct udev_device *udev_device, const char *driver);
 extern const char *udev_device_get_devpath_old(struct udev_device *udev_device);
@@ -76,8 +85,14 @@ extern int udev_device_get_ignore_remove(struct udev_device *udev_device);
 extern int udev_device_set_ignore_remove(struct udev_device *udev_device, int ignore);
 extern void udev_device_set_info_loaded(struct udev_device *device);
 
+/* libudev-device-db-write.c */
+extern int udev_device_update_db(struct udev_device *udev_device);
+extern int udev_device_delete_db(struct udev_device *udev_device);
+extern int udev_device_rename_db(struct udev_device *udev_device, const char *devpath);
+
 /* libudev-monitor - netlink/unix socket communication  */
 extern int udev_monitor_send_device(struct udev_monitor *udev_monitor, struct udev_device *udev_device);
+extern int udev_monitor_set_receive_buffer_size(struct udev_monitor *udev_monitor, int size);
 
 /* libudev-ctrl - daemon runtime setup */
 struct udev_ctrl;
@@ -110,18 +125,30 @@ struct udev_list_node {
        struct udev_list_node *next, *prev;
 };
 extern void udev_list_init(struct udev_list_node *list);
-extern void udev_list_cleanup(struct udev *udev, struct udev_list_node *name_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 void udev_list_entry_move_to_end(struct udev_list_entry *list_entry);
 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 list_entry_foreach_safe(entry, tmp, first) \
-       for (entry = first, \
-            tmp = udev_list_entry_get_next(entry); \
+#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))