add "static" back to the inline functions

[elogind.git] / udev / udev.h

diff --git a/udev/udev.h b/udev/udev.h
index 57e2d73c2e656aea65f0180a66dad0449be6b786..abf354a668aee2800e275ccb35903d74ff009663 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -87,43 +87,42 @@ struct udev_watch {
 
 /* udev-rules.c */
 struct udev_rules;
-extern struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
-extern void udev_rules_unref(struct udev_rules *rules);
-extern int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event);
+struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
+void udev_rules_unref(struct udev_rules *rules);
+int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event);
 
 /* udev-event.c */
-extern struct udev_event *udev_event_new(struct udev_device *dev);
-extern void udev_event_unref(struct udev_event *event);
-extern int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
-extern int udev_event_execute_run(struct udev_event *event);
-extern void udev_event_apply_format(struct udev_event *event, char *string, size_t maxsize);
-extern int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string,
-                                         char *result, size_t maxsize, int read_value);
+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);
+int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string,
+                                  char *result, size_t maxsize, int read_value);
 
 /* udev-watch.c */
 extern int inotify_fd;
-extern void udev_watch_init(struct udev *udev);
-extern void udev_watch_restore(struct udev *udev);
-extern void udev_watch_begin(struct udev *udev, struct udev_device *dev);
-extern void udev_watch_clear(struct udev *udev, struct udev_device *dev);
-extern void udev_watch_end(struct udev *udev, int wd);
-extern const char *udev_watch_lookup(struct udev *udev, int wd);
+void udev_watch_init(struct udev *udev);
+void udev_watch_restore(struct udev *udev);
+void udev_watch_begin(struct udev *udev, struct udev_device *dev);
+void udev_watch_end(struct udev *udev, struct udev_device *dev);
+struct udev_device *udev_watch_lookup(struct udev *udev, int wd);
 
 /* udev-node.c */
-extern int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid);
-extern int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid);
-extern int udev_node_remove(struct udev_device *dev);
-extern void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
+int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid);
+int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid);
+int udev_node_remove(struct udev_device *dev);
+void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
 
 /* udev-util.c */
-extern int util_create_path(struct udev *udev, const char *path);
-extern int util_delete_path(struct udev *udev, const char *path);
-extern int util_unlink_secure(struct udev *udev, const char *filename);
-extern uid_t util_lookup_user(struct udev *udev, const char *user);
-extern gid_t util_lookup_group(struct udev *udev, const char *group);
-extern int util_run_program(struct udev *udev, const char *command, char **envp,
-                           char *result, size_t ressize, size_t *reslen);
-extern int util_resolve_subsys_kernel(struct udev *udev, const char *string,
+int util_create_path(struct udev *udev, const char *path);
+int util_delete_path(struct udev *udev, const char *path);
+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);
+int util_resolve_subsys_kernel(struct udev *udev, const char *string,
                                      char *result, size_t maxsize, int read_value);
 
 /* udev-selinux.c */
@@ -134,18 +133,18 @@ static inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file,
 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
-extern void udev_selinux_init(struct udev *udev);
-extern void udev_selinux_exit(struct udev *udev);
-extern void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
-extern void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
-extern void udev_selinux_resetfscreatecon(struct udev *udev);
+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_resetfscreatecon(struct udev *udev);
 #endif
 
 /* udevadm commands */
-extern int udevadm_monitor(struct udev *udev, int argc, char *argv[]);
-extern int udevadm_info(struct udev *udev, int argc, char *argv[]);
-extern int udevadm_control(struct udev *udev, int argc, char *argv[]);
-extern int udevadm_trigger(struct udev *udev, int argc, char *argv[]);
-extern int udevadm_settle(struct udev *udev, int argc, char *argv[]);
-extern int udevadm_test(struct udev *udev, int argc, char *argv[]);
+int udevadm_monitor(struct udev *udev, int argc, char *argv[]);
+int udevadm_info(struct udev *udev, int argc, char *argv[]);
+int udevadm_control(struct udev *udev, int argc, char *argv[]);
+int udevadm_trigger(struct udev *udev, int argc, char *argv[]);
+int udevadm_settle(struct udev *udev, int argc, char *argv[]);
+int udevadm_test(struct udev *udev, int argc, char *argv[]);
 #endif