udevadm: rename internal functions to udevadm_*

This commit is contained in:
Kay Sievers 2008-09-03 23:38:32 +02:00
parent e4255f1153
commit 32bf83996b
8 changed files with 19 additions and 19 deletions

View File

@ -167,12 +167,12 @@ extern void file_unmap(void *buf, size_t bufsize);
extern int unlink_secure(const char *filename); extern int unlink_secure(const char *filename);
extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur); extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur);
/* udev commands */ /* udevadm commands */
extern int udevmonitor(int argc, char *argv[]); extern int udevadm_monitor(int argc, char *argv[]);
extern int udevinfo(int argc, char *argv[]); extern int udevadm_info(int argc, char *argv[]);
extern int udevcontrol(int argc, char *argv[]); extern int udevadm_control(int argc, char *argv[]);
extern int udevtrigger(int argc, char *argv[]); extern int udevadm_trigger(int argc, char *argv[]);
extern int udevsettle(int argc, char *argv[]); extern int udevadm_settle(int argc, char *argv[]);
extern int udevtest(int argc, char *argv[]); extern int udevadm_test(int argc, char *argv[]);
#endif #endif

View File

@ -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; struct udev_ctrl *uctrl;
const char *env; const char *env;

View File

@ -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; int option;
struct udevice *udev = NULL; struct udevice *udev = NULL;

View File

@ -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; struct sigaction act;
int option; int option;

View File

@ -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 queuename[PATH_SIZE];
char filename[PATH_SIZE]; char filename[PATH_SIZE];

View File

@ -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; int force = 0;
const char *action = "add"; const char *action = "add";

View 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; int failed = 0;
const char *sockpath = NULL; const char *sockpath = NULL;

View File

@ -76,32 +76,32 @@ static int help(int argc, char *argv[])
static const struct command cmds[] = { static const struct command cmds[] = {
{ {
.name = "info", .name = "info",
.cmd = udevinfo, .cmd = udevadm_info,
.help = "query sysfs or the udev database", .help = "query sysfs or the udev database",
}, },
{ {
.name = "trigger", .name = "trigger",
.cmd = udevtrigger, .cmd = udevadm_trigger,
.help = "request events from the kernel", .help = "request events from the kernel",
}, },
{ {
.name = "settle", .name = "settle",
.cmd = udevsettle, "", .cmd = udevadm_settle, "",
.help = "wait for the event queue to finish", .help = "wait for the event queue to finish",
}, },
{ {
.name = "control", .name = "control",
.cmd = udevcontrol, .cmd = udevadm_control,
.help = "control the udev daemon", .help = "control the udev daemon",
}, },
{ {
.name = "monitor", .name = "monitor",
.cmd = udevmonitor, .cmd = udevadm_monitor,
.help = "listen to kernel and udev events", .help = "listen to kernel and udev events",
}, },
{ {
.name = "test", .name = "test",
.cmd = udevtest, .cmd = udevadm_test,
.help = "simulation run", .help = "simulation run",
.debug = 1, .debug = 1,
}, },