mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
udevadm: rename internal functions to udevadm_*
This commit is contained in:
parent
e4255f1153
commit
32bf83996b
14
udev/udev.h
14
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
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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];
|
||||
|
@ -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";
|
||||
|
@ -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;
|
||||
|
@ -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,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user