cdrom_id: add error message if open() fails

[elogind.git] / udev / udev.h

diff --git a/udev/udev.h b/udev/udev.h
index 478a51f3dc95e5baf88670d320ae04dd67ff2127..8f2c1c63dda66965ed11cc2cf218fb1677802134 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -96,7 +96,7 @@ struct udev_event *udev_event_new(struct udev_device *dev);
 void udev_event_unref(struct udev_event *event);
 int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
 int udev_event_execute_run(struct udev_event *event);
-void udev_event_apply_format(struct udev_event *event, char *string, size_t maxsize);
+size_t udev_event_apply_format(struct udev_event *event, const char *src, char *dest, size_t size);
 int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string,
                                   char *result, size_t maxsize, int read_value);
 
@@ -127,11 +127,11 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string,
 
 /* udev-selinux.c */
 #ifndef USE_SELINUX
-inline void udev_selinux_init(struct udev *udev) {}
-inline void udev_selinux_exit(struct udev *udev) {}
-inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {}
-inline void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode) {}
-inline void udev_selinux_resetfscreatecon(struct udev *udev) {}
+static inline void udev_selinux_init(struct udev *udev) {}
+static inline void udev_selinux_exit(struct udev *udev) {}
+static inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {}
+static inline void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode) {}
+static inline void udev_selinux_resetfscreatecon(struct udev *udev) {}
 #else
 void udev_selinux_init(struct udev *udev);
 void udev_selinux_exit(struct udev *udev);