X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-private.h;h=c2fff0021115e874c21ba334a82f8c3c336abe06;hp=b735298c67a61bdfd151c1fd0f8a9a5c95d433c4;hb=1a259f1ac892e94593b661aec2bc93ad931f7c65;hpb=2ffc9cc1917b1bb6fe86881a94a47dce9aa15168

diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h
index b735298c6..c2fff0021 100644
--- a/libudev/libudev-private.h
+++ b/libudev/libudev-private.h
@@ -13,6 +13,7 @@
 #define _LIBUDEV_PRIVATE_H_
 
 #include <syslog.h>
+#include <signal.h>
 #include "libudev.h"
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
@@ -25,7 +26,7 @@ udev_log_null(struct udev *udev, const char *format, ...) {}
 #define udev_log_cond(udev, prio, arg...) \
   do { \
     if (udev_get_log_priority(udev) >= prio) \
-      udev_log(udev, LOG_ERR, __FILE__, __LINE__, __FUNCTION__, ## arg); \
+      udev_log(udev, prio, __FILE__, __LINE__, __FUNCTION__, ## arg); \
   } while (0)
 
 #ifdef ENABLE_LOGGING
@@ -58,7 +59,6 @@ void udev_log(struct udev *udev,
 	      const char *format, ...)
 	      __attribute__((format(printf, 6, 7)));
 const char *udev_get_rules_path(struct udev *udev);
-int udev_get_run(struct udev *udev);
 struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value);
 struct udev_list_entry *udev_get_properties_list_entry(struct udev *udev);
 
@@ -68,7 +68,7 @@ int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath
 int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem);
 int udev_device_set_devtype(struct udev_device *udev_device, const char *devtype);
 int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode);
-int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink);
+int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink, int unique);
 void udev_device_cleanup_devlinks_list(struct udev_device *udev_device);
 struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value);
 struct udev_list_entry *udev_device_add_property_from_string(struct udev_device *udev_device, const char *property);
@@ -204,7 +204,6 @@ size_t util_strscpyl(char *dest, size_t size, const char *src, ...) __attribute_
 int udev_util_replace_whitespace(const char *str, char *to, size_t len);
 int udev_util_replace_chars(char *str, const char *white);
 int udev_util_encode_string(const char *str, char *str_enc, size_t len);
-void util_set_fd_cloexec(int fd);
 unsigned int util_string_hash32(const char *str);
 
 /* libudev-util-private.c */
@@ -214,7 +213,8 @@ int util_unlink_secure(struct udev *udev, const char *filename);
 uid_t util_lookup_user(struct udev *udev, const char *user);
 gid_t util_lookup_group(struct udev *udev, const char *group);
 int util_run_program(struct udev *udev, const char *command, char **envp,
-		     char *result, size_t ressize, size_t *reslen);
+		     char *result, size_t ressize, size_t *reslen,
+		     const sigset_t *sigmask);
 int util_resolve_subsys_kernel(struct udev *udev, const char *string,
 				      char *result, size_t maxsize, int read_value);