libudev: fix --enable-debug

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

diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h
index 5be798317d2f9afbe0f6912536838c4aed5596f6..b74e26c97e2de7290d9304f204826420a74c7586 100644 (file)
--- a/udev/lib/libudev-private.h
+++ b/udev/lib/libudev-private.h
@@ -22,25 +22,22 @@
 
 #include <syslog.h>
 #include "libudev.h"
-#include "list.h"
 
-#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)
-#endif /* USE_DEBUG */
+static inline void __attribute__ ((format(printf, 2, 3)))
+log_null(struct udev *udev, const char *format, ...) {}
 
-#define info(udev, arg...) \
-       udev_log(udev, LOG_INFO, __FILE__, __LINE__, __FUNCTION__, ## arg)
-
-#define err(udev, arg...) \
-       udev_log(udev, LOG_ERR, __FILE__, __LINE__, __FUNCTION__, ## arg)
+#ifdef USE_LOG
+#  ifdef DEBUG
+#    define dbg(udev, arg...) udev_log(udev, LOG_DEBUG, __FILE__, __LINE__, __FUNCTION__, ## arg)
+#  else
+#    define dbg(udev, arg...) log_null(udev, ## arg)
+#  endif
+#  define info(udev, arg...) udev_log(udev, LOG_INFO, __FILE__, __LINE__, __FUNCTION__, ## arg)
+#  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(udev, arg...) log_null(udev, ## arg)
+#  define info(udev, arg...) log_null(udev, ## arg)
+#  define err(udev, arg...) log_null(udev, ## arg)
 #endif
 
 /* libudev */
@@ -48,7 +45,7 @@ void udev_log(struct udev *udev,
              int priority, const char *file, int line, const char *fn,
              const char *format, ...)
              __attribute__ ((format(printf, 6, 7)));
-extern struct udev_device *device_init(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);
 
@@ -106,22 +103,33 @@ 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-queue */
+extern int queue_export_udev_seqnum(struct udev_queue *udev_queue, unsigned long long int seqnum);
+extern int queue_export_device_queued(struct udev_queue *udev_queue, struct udev_device *udev_device);
+extern int queue_export_device_finished(struct udev_queue *udev_queue, struct udev_device *udev_device);
+extern int 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
-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);