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=c80c940b1f947cb7b12b0b8abbff1e97cff8424d;hp=f28bd9acfc3b345b7a8a3f62a2665de07cc0311a;hb=bf7ad0ea662e747701cc66cdd1b33d22b6836cdf;hpb=0518da3b74a388680896747696b3644bbd3d98e5

diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h
index f28bd9acf..c80c940b1 100644
--- a/udev/lib/libudev-private.h
+++ b/udev/lib/libudev-private.h
@@ -20,8 +20,6 @@
 #ifndef _LIBUDEV_PRIVATE_H_
 #define _LIBUDEV_PRIVATE_H_
 
-#include "config.h"
-
 #include <syslog.h>
 #include "libudev.h"
 #include "list.h"
@@ -55,7 +53,7 @@ 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_add_devlink(struct udev_device *udev_device, const char *devlink);
@@ -78,7 +76,7 @@ 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);
 
-/* 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);
@@ -104,6 +102,13 @@ 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 */
+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);
+
 /* libudev-utils */
 #define UTIL_PATH_SIZE		1024
 #define UTIL_LINE_SIZE		2048
@@ -114,12 +119,9 @@ struct util_name_entry {
 	char *value;
 	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, const char *value, int sort);
-extern void util_name_list_cleanup(struct udev *udev, struct list_head *name_list);
+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);
@@ -127,5 +129,4 @@ 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);
-extern char *util_sysattr_get_value(struct udev *udev, const char *devpath, const char *attr_name);
 #endif