diff options
| -rw-r--r-- | udev/udev.h | 14 | ||||
| -rw-r--r-- | udev/udevadm-control.c | 2 | ||||
| -rw-r--r-- | udev/udevadm-info.c | 2 | ||||
| -rw-r--r-- | udev/udevadm-monitor.c | 2 | ||||
| -rw-r--r-- | udev/udevadm-settle.c | 2 | ||||
| -rw-r--r-- | udev/udevadm-test.c | 2 | ||||
| -rw-r--r-- | udev/udevadm-trigger.c | 2 | ||||
| -rw-r--r-- | udev/udevadm.c | 12 |
8 files changed, 19 insertions, 19 deletions
diff --git a/udev/udev.h b/udev/udev.h index da86365056..6005cd2a06 100644 --- 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); -/* 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 diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c index 5f1952543c..68548fd1fa 100644 --- 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; } -int udevcontrol(int argc, char *argv[]) +int udevadm_control(int argc, char *argv[]) { struct udev_ctrl *uctrl; const char *env; diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c index 6501b57d1a..1f47b89952 100644 --- 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; } -int udevinfo(int argc, char *argv[]) +int udevadm_info(int argc, char *argv[]) { int option; struct udevice *udev = NULL; diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c index 3b65bcae9b..a45f165cfe 100644 --- 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; } -int udevmonitor(int argc, char *argv[]) +int udevadm_monitor(int argc, char *argv[]) { struct sigaction act; int option; diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c index 11277f5a43..0cb9ece472 100644 --- a/udev/udevadm-settle.c +++ b/udev/udevadm-settle.c @@ -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]; diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c index 63603aad97..291f7e934f 100644 --- a/udev/udevadm-test.c +++ b/udev/udevadm-test.c @@ -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"; diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c index 4a8f62ab5c..322040582e 100644 --- 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; diff --git a/udev/udevadm.c b/udev/udevadm.c index 863bc467f0..aa0befed3b 100644 --- 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", - .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, }, |