udevadm: rename internal functions to udevadm_*

diff --git a/udev/udev.h b/udev/udev.h
index da86365056e47d7c8aaa49d70cf6ded43dd75584..6005cd2a06b8f9527b9d21ab176dc5b234152511 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -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);
 
 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
 
 #endif

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index 5f1952543c8b5218e8e2c1beb0d8bbd0b6371172..68548fd1fa59d37d4b061bbc43361b0e106a9e91 100644 (file)
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -148,7 +148,7 @@ int udev_ctrl_set_max_childs_running(struct udev_ctrl *uctrl, int count)
        return 0;
 }
 
        return 0;
 }
 

-int udevcontrol(int argc, char *argv[])
+int udevadm_control(int argc, char *argv[])

 {
        struct udev_ctrl *uctrl;
        const char *env;
 {
        struct udev_ctrl *uctrl;
        const char *env;

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 6501b57d1a48958dd396f8af0f75cb4b4bc570fc..1f47b899520f4c3ad915ac354c28e5cd1f7e592c 100644 (file)
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -234,7 +234,7 @@ static int stat_device(const char *name, int export, const char *prefix)
        return 0;
 }
 
        return 0;
 }
 

-int udevinfo(int argc, char *argv[])
+int udevadm_info(int argc, char *argv[])

 {
        int option;
        struct udevice *udev = NULL;
 {
        int option;
        struct udevice *udev = NULL;

diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 3b65bcae9b3ae7270e345d1df5a974744b79751d..a45f165cfe95fedc2af433861dbe1d97bceec978 100644 (file)
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -123,7 +123,7 @@ static const char *search_key(const char *searchkey, const char *buf, size_t buf
        return NULL;
 }
 
        return NULL;
 }
 

-int udevmonitor(int argc, char *argv[])
+int udevadm_monitor(int argc, char *argv[])

 {
        struct sigaction act;
        int option;
 {
        struct sigaction act;
        int option;

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 11277f5a4345db9214312cb8c6e6d2729f260584..0cb9ece472ebc2e05a78cf888ef5adf0fa411bbd 100644 (file)
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -67,7 +67,7 @@ static void print_queue(const char *dir)
        printf("\n\n");
 }
 
        printf("\n\n");
 }
 

-int udevsettle(int argc, char *argv[])
+int udevadm_settle(int argc, char *argv[])

 {
        char queuename[PATH_SIZE];
        char filename[PATH_SIZE];
 {
        char queuename[PATH_SIZE];
        char filename[PATH_SIZE];

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index 63603aad97fd8a26161b2f66534da3946a18f7ab..291f7e934f43ee627a0a61bb7ecd1dcbdc5c4c61 100644 (file)
--- a/udev/udevadm-test.c
+++ b/udev/udevadm-test.c
@@ -71,7 +71,7 @@ out:
        return rc;
 }
 
        return rc;
 }
 

-int udevtest(int argc, char *argv[])
+int udevadm_test(int argc, char *argv[])

 {
        int force = 0;
        const char *action = "add";
 {
        int force = 0;
        const char *action = "add";

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index 4a8f62ab5c2bb23d77bdce10c54051016dee52dc..322040582e75506c5e91a91f09b43e9d39ce56af 100644 (file)
--- a/udev/udevadm-trigger.c
+++ b/udev/udevadm-trigger.c
@@ -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;
 {
        int failed = 0;
        const char *sockpath = NULL;

diff --git a/udev/udevadm.c b/udev/udevadm.c
index 863bc467f0fb31a8c5ad89c3aedee1862223f47e..aa0befed3be311721f20a590670b9c7af50c1c2c 100644 (file)
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -76,32 +76,32 @@ static int help(int argc, char *argv[])
 static const struct command cmds[] = {
        {
                .name = "info",
 static const struct command cmds[] = {
        {
                .name = "info",

-               .cmd = udevinfo,
+               .cmd = udevadm_info,

                .help = "query sysfs or the udev database",
        },
        {
                .name = "trigger",
                .help = "query sysfs or the udev database",
        },
        {
                .name = "trigger",

-               .cmd = udevtrigger,
+               .cmd = udevadm_trigger,

                .help = "request events from the kernel",
        },
        {
                .name = "settle",
                .help = "request events from the kernel",
        },
        {
                .name = "settle",

-               .cmd = udevsettle, "",
+               .cmd = udevadm_settle, "",

                .help = "wait for the event queue to finish",
        },
        {
                .name = "control",
                .help = "wait for the event queue to finish",
        },
        {
                .name = "control",

-               .cmd = udevcontrol,
+               .cmd = udevadm_control,

                .help = "control the udev daemon",
        },
        {
                .name = "monitor",
                .help = "control the udev daemon",
        },
        {
                .name = "monitor",

-               .cmd = udevmonitor,
+               .cmd = udevadm_monitor,

                .help = "listen to kernel and udev events",
        },
        {
                .name = "test",
                .help = "listen to kernel and udev events",
        },
        {
                .name = "test",

-               .cmd = udevtest,
+               .cmd = udevadm_test,

                .help = "simulation run",
                .debug = 1,
        },
                .help = "simulation run",
                .debug = 1,
        },