X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-private.h;h=8f847158b2edd8fbb57357c0df2096076dd77dce;hb=4aa0b15efbb44dbcbb0a4fa6e7bb45e70e1ec537;hp=32837e368d278b11f01bd97859af0fbe6563a75f;hpb=3eb46ec6ddeb31d9886ebb736d1d7b3534d2f354;p=elogind.git

diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h
index 32837e368..8f847158b 100644
--- a/udev/lib/libudev-private.h
+++ b/udev/lib/libudev-private.h
@@ -20,18 +20,20 @@
 #ifndef _LIBUDEV_PRIVATE_H_
 #define _LIBUDEV_PRIVATE_H_
 
-#include "config.h"
-
 #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...) \
@@ -40,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,11 +57,12 @@ extern const char *udev_get_rules_path(struct udev *udev);
 extern int udev_get_run(struct udev *udev);
 
 /* libudev-device */
-extern int device_set_devpath(struct udev_device *udev_device, const char *devpath);
+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 *property);
+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);
 extern int device_set_action(struct udev_device *udev_device, const char *action);
 extern int device_set_driver(struct udev_device *udev_device, const char *driver);
 extern const char *device_get_devpath_old(struct udev_device *udev_device);
@@ -68,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);
@@ -76,8 +81,9 @@ 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);
 
-/* udev_ctrl - daemon runtime setup */
+/* libudev-ctrl - daemon runtime setup */
 struct udev_ctrl;
 extern struct udev_ctrl *udev_ctrl_new_from_socket(struct udev *udev, const char *socket_path);
 extern int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl);
@@ -103,24 +109,36 @@ extern int udev_ctrl_get_reload_rules(struct udev_ctrl_msg *ctrl_msg);
 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 */
+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		1024
-struct util_name_entry {
-	struct list_head node;
-	char *name;
-	int *i;
-};
-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, int sort);
-extern void util_name_list_cleanup(struct udev *udev, struct list_head *name_list);
+#define UTIL_LINE_SIZE		2048
+#define UTIL_NAME_SIZE		512
+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);
 extern int util_log_priority(const char *priority);
 extern size_t util_path_encode(char *s, size_t len);
 extern size_t util_path_decode(char *s);
 extern void util_remove_trailing_chars(char *path, char c);
 extern size_t util_strlcpy(char *dst, const char *src, size_t size);
 extern size_t util_strlcat(char *dst, const char *src, size_t size);
+extern int util_replace_chars(char *str, const char *white);
 #endif