chiark / gitweb /
udevadm: rename internal functions to udevadm_*
authorKay Sievers <kay.sievers@vrfy.org>
Wed, 3 Sep 2008 21:38:32 +0000 (23:38 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Wed, 3 Sep 2008 21:38:32 +0000 (23:38 +0200)
udev/udev.h
udev/udevadm-control.c
udev/udevadm-info.c
udev/udevadm-monitor.c
udev/udevadm-settle.c
udev/udevadm-test.c
udev/udevadm-trigger.c
udev/udevadm.c

index da86365..6005cd2 100644 (file)
@@ -167,12 +167,12 @@ extern void file_unmap(void *buf, size_t bufsize);
 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[]);
-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[]);
+/* udevadm commands */
+extern int udevadm_monitor(int argc, char *argv[]);
+extern int udevadm_info(int argc, char *argv[]);
+extern int udevadm_control(int argc, char *argv[]);
+extern int udevadm_trigger(int argc, char *argv[]);
+extern int udevadm_settle(int argc, char *argv[]);
+extern int udevadm_test(int argc, char *argv[]);
 
 #endif
index 5f19525..68548fd 100644 (file)
@@ -148,7 +148,7 @@ int udev_ctrl_set_max_childs_running(struct udev_ctrl *uctrl, int count)
        return 0;
 }
 
-int udevcontrol(int argc, char *argv[])
+int udevadm_control(int argc, char *argv[])
 {
        struct udev_ctrl *uctrl;
        const char *env;
index 6501b57..1f47b89 100644 (file)
@@ -234,7 +234,7 @@ static int stat_device(const char *name, int export, const char *prefix)
        return 0;
 }
 
-int udevinfo(int argc, char *argv[])
+int udevadm_info(int argc, char *argv[])
 {
        int option;
        struct udevice *udev = NULL;
index 3b65bca..a45f165 100644 (file)
@@ -123,7 +123,7 @@ static const char *search_key(const char *searchkey, const char *buf, size_t buf
        return NULL;
 }
 
-int udevmonitor(int argc, char *argv[])
+int udevadm_monitor(int argc, char *argv[])
 {
        struct sigaction act;
        int option;
index 11277f5..0cb9ece 100644 (file)
@@ -67,7 +67,7 @@ static void print_queue(const char *dir)
        printf("\n\n");
 }
 
-int udevsettle(int argc, char *argv[])
+int udevadm_settle(int argc, char *argv[])
 {
        char queuename[PATH_SIZE];
        char filename[PATH_SIZE];
index 63603aa..291f7e9 100644 (file)
@@ -71,7 +71,7 @@ out:
        return rc;
 }
 
-int udevtest(int argc, char *argv[])
+int udevadm_test(int argc, char *argv[])
 {
        int force = 0;
        const char *action = "add";
index 4a8f62a..3220405 100644 (file)
@@ -562,7 +562,7 @@ static void scan_failed(void)
        }
 }
 
-int udevtrigger(int argc, char *argv[])
+int udevadm_trigger(int argc, char *argv[])
 {
        int failed = 0;
        const char *sockpath = NULL;
index 863bc46..aa0befe 100644 (file)
@@ -76,32 +76,32 @@ static int help(int argc, char *argv[])
 static const struct command cmds[] = {
        {
                .name = "info",
-               .cmd = udevinfo,
+               .cmd = udevadm_info,
                .help = "query sysfs or the udev database",
        },
        {
                .name = "trigger",
-               .cmd = udevtrigger,
+               .cmd = udevadm_trigger,
                .help = "request events from the kernel",
        },
        {
                .name = "settle",
-               .cmd = udevsettle, "",
+               .cmd = udevadm_settle, "",
                .help = "wait for the event queue to finish",
        },
        {
                .name = "control",
-               .cmd = udevcontrol,
+               .cmd = udevadm_control,
                .help = "control the udev daemon",
        },
        {
                .name = "monitor",
-               .cmd = udevmonitor,
+               .cmd = udevadm_monitor,
                .help = "listen to kernel and udev events",
        },
        {
                .name = "test",
-               .cmd = udevtest,
+               .cmd = udevadm_test,
                .help = "simulation run",
                .debug = 1,
        },