udevadm: control - use getopt_long()

[elogind.git] / udev / udev.h

diff --git a/udev/udev.h b/udev/udev.h
index 5ecef4abbda3ae17778b0ac9f3f077e934555c6c..da86365056e47d7c8aaa49d70cf6ded43dd75584 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -26,7 +26,6 @@
 #include "list.h"
 #include "logging.h"
 #include "udev_sysdeps.h"
-#include "udev_version.h"
 
 #define COMMENT_CHARACTER                      '#'
 #define LINE_SIZE                              512
@@ -47,13 +46,6 @@
 #define READ_END                               0
 #define WRITE_END                              1
 
-#define UDEV_ROOT                              "/dev"
-#define DB_DIR                                 ".udev/db"
-#define DB_NAME_INDEX_DIR                      ".udev/names"
-#define RULES_LIB_DIR                          "/lib/udev/rules.d"
-#define RULES_DYN_DIR                          ".udev/rules.d"
-#define RULES_ETC_DIR                          "/etc/udev/rules.d"
-
 struct udev_rules;
 
 struct sysfs_device {
@@ -109,11 +101,13 @@ extern int udev_run;
 extern void udev_config_init(void);
 
 /* udev_device.c */
-extern struct udevice *udev_device_init(struct udevice *udev);
+extern struct udevice *udev_device_init(void);
 extern void udev_device_cleanup(struct udevice *udev);
-extern int udev_device_event(struct udev_rules *rules, struct udevice *udev);
 extern dev_t udev_device_get_devt(struct udevice *udev);
 
+/* udev_device_event.c */
+extern int udev_device_event(struct udev_rules *rules, struct udevice *udev);
+
 /* udev_sysfs.c */
 extern char sysfs_path[PATH_SIZE];
 extern int sysfs_init(void);
@@ -174,11 +168,11 @@ extern int unlink_secure(const char *filename);
 extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur);
 
 /* udev commands */
-extern int udevmonitor(int argc, char *argv[], char *envp[]);
-extern int udevinfo(int argc, char *argv[], char *envp[]);
-extern int udevcontrol(int argc, char *argv[], char *envp[]);
-extern int udevtrigger(int argc, char *argv[], char *envp[]);
-extern int udevsettle(int argc, char *argv[], char *envp[]);
-extern int udevtest(int argc, char *argv[], char *envp[]);
+extern int udevmonitor(int argc, char *argv[]);
+extern int udevinfo(int argc, char *argv[]);
+extern int udevcontrol(int argc, char *argv[]);
+extern int udevtrigger(int argc, char *argv[]);
+extern int udevsettle(int argc, char *argv[]);
+extern int udevtest(int argc, char *argv[]);
 
 #endif