X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-private.h;h=7ed4afc42c7d1db91e50b494cbdba6ab59709560;hb=83184d008ba23724fd30996440534c0633a0d0aa;hp=fa9722360b9df5ebc603ff53f628fc51bd043b63;hpb=cb9a0eeeab56c402dbbab79f3c1be985139ccfd9;p=elogind.git

diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h
index fa9722360..7ed4afc42 100644
--- a/libudev/libudev-private.h
+++ b/libudev/libudev-private.h
@@ -104,7 +104,6 @@ void udev_device_set_info_loaded(struct udev_device *device);
 /* libudev-device-private.c */
 int udev_device_update_db(struct udev_device *udev_device);
 int udev_device_delete_db(struct udev_device *udev_device);
-int udev_device_rename_db(struct udev_device *udev_device);
 int udev_device_tag_index(struct udev_device *dev, struct udev_device *dev_old, bool add);
 
 /* libudev-monitor.c - netlink/unix socket communication  */
@@ -127,7 +126,7 @@ int udev_ctrl_send_start_exec_queue(struct udev_ctrl *uctrl);
 int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl);
 int udev_ctrl_send_settle(struct udev_ctrl *uctrl);
 int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key);
-int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count);
+int udev_ctrl_send_set_children_max(struct udev_ctrl *uctrl, int count);
 struct udev_ctrl_msg;
 struct udev_ctrl_msg *udev_ctrl_msg(struct udev_ctrl *uctrl);
 struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl);
@@ -139,7 +138,7 @@ int udev_ctrl_get_start_exec_queue(struct udev_ctrl_msg *ctrl_msg);
 int udev_ctrl_get_reload_rules(struct udev_ctrl_msg *ctrl_msg);
 pid_t udev_ctrl_get_settle(struct udev_ctrl_msg *ctrl_msg);
 const char *udev_ctrl_get_set_env(struct udev_ctrl_msg *ctrl_msg);
-int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg);
+int udev_ctrl_get_set_children_max(struct udev_ctrl_msg *ctrl_msg);
 
 /* libudev-list.c */
 struct udev_list_node {
@@ -227,14 +226,14 @@ 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_setfscreateconat(struct udev *udev, int dirfd, const char *file, unsigned int mode) {}
+static inline void udev_selinux_setfscreateconat(struct udev *udev, int dfd, 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);
 void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
 void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
-void udev_selinux_setfscreateconat(struct udev *udev, int dirfd, const char *file, unsigned int mode);
+void udev_selinux_setfscreateconat(struct udev *udev, int dfd, const char *file, unsigned int mode);
 void udev_selinux_resetfscreatecon(struct udev *udev);
 #endif