X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-private.h;h=8f847158b2edd8fbb57357c0df2096076dd77dce;hp=c80c940b1f947cb7b12b0b8abbff1e97cff8424d;hb=9176ac1f4e42f71df692773651898100b253774c;hpb=bf7ad0ea662e747701cc66cdd1b33d22b6836cdf

diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h
index c80c940b1..8f847158b 100644
--- a/udev/lib/libudev-private.h
+++ b/udev/lib/libudev-private.h
@@ -22,14 +22,18 @@
 
 #include <syslog.h>
 #include "libudev.h"
-#include "list.h"
+
+static inline void __attribute__ ((format(printf, 2, 3)))
+log_null(struct udev *udev, const char *format, ...)
+{
+}
 
 #ifdef USE_LOG
 #ifdef USE_DEBUG
 #define dbg(udev, arg...) \
 	udev_log(udev, LOG_DEBUG, __FILE__, __LINE__, __FUNCTION__, ## arg)
 #else
-#define dbg(format, arg...) do { } while (0)
+#define dbg log_null
 #endif /* USE_DEBUG */
 
 #define info(udev, arg...) \
@@ -38,9 +42,9 @@
 #define err(udev, arg...) \
 	udev_log(udev, LOG_ERR, __FILE__, __LINE__, __FUNCTION__, ## arg)
 #else
-#define dbg(format, arg...) do { } while (0)
-#define info(format, arg...) do { } while (0)
-#define err(format, arg...) do { } while (0)
+#define dbg log_null
+#define info log_null
+#define err log_null
 #endif
 
 /* libudev */
@@ -55,7 +59,7 @@ extern int udev_get_run(struct udev *udev);
 /* libudev-device */
 extern int device_set_syspath(struct udev_device *udev_device, const char *syspath);
 extern int device_set_subsystem(struct udev_device *udev_device, const char *subsystem);
-extern int device_set_devname(struct udev_device *udev_device, const char *devname);
+extern int device_set_devnode(struct udev_device *udev_device, const char *devnode);
 extern int device_add_devlink(struct udev_device *udev_device, const char *devlink);
 extern int device_add_property(struct udev_device *udev_device, const char *key, const char *value);
 extern int device_add_property_from_string(struct udev_device *udev_device, const char *property);
@@ -67,6 +71,8 @@ extern const char *device_get_physdevpath(struct udev_device *udev_device);
 extern int device_set_physdevpath(struct udev_device *udev_device, const char *physdevpath);
 extern int device_get_timeout(struct udev_device *udev_device);
 extern int device_set_timeout(struct udev_device *udev_device, int timeout);
+extern int device_get_event_timeout(struct udev_device *udev_device);
+extern int device_set_event_timeout(struct udev_device *udev_device, int event_timeout);
 extern int device_set_devnum(struct udev_device *udev_device, dev_t devnum);
 extern int device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum);
 extern int device_get_num_fake_partitions(struct udev_device *udev_device);
@@ -75,6 +81,7 @@ extern int device_get_devlink_priority(struct udev_device *udev_device);
 extern int device_set_devlink_priority(struct udev_device *udev_device, int prio);
 extern int device_get_ignore_remove(struct udev_device *udev_device);
 extern int device_set_ignore_remove(struct udev_device *udev_device, int ignore);
+extern void device_set_info_loaded(struct udev_device *device);
 
 /* libudev-ctrl - daemon runtime setup */
 struct udev_ctrl;
@@ -103,22 +110,27 @@ extern const char *udev_ctrl_get_set_env(struct udev_ctrl_msg *ctrl_msg);
 extern int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg);
 
 /* libudev-list */
-extern struct udev_list *list_insert(struct udev *udev, struct list_head *name_list,
-				     const char *name, const char *value, int sort);
-extern struct udev_list *list_get_entry(struct list_head *list);
-extern void list_move_to_end(struct udev_list *list_entry, struct list_head *list);
-extern void list_cleanup(struct udev *udev, struct list_head *name_list);
+struct list_node {
+	struct list_node *next, *prev;
+};
+extern void list_init(struct list_node *list);
+extern void list_cleanup(struct udev *udev, struct list_node *name_list);
+extern struct udev_list_entry *list_entry_add(struct udev *udev, struct list_node *list,
+					      const char *name, const char *value,
+					      int unique, int sort);
+extern void list_entry_remove(struct udev_list_entry *entry);
+extern struct udev_list_entry *list_get_entry(struct list_node *list);
+extern void list_entry_move_to_end(struct udev_list_entry *list_entry);
+#define 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-utils */
 #define UTIL_PATH_SIZE		1024
 #define UTIL_LINE_SIZE		2048
 #define UTIL_NAME_SIZE		512
-struct util_name_entry {
-	struct list_head node;
-	char *name;
-	char *value;
-	int *i;
-};
 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);