mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
udev_event_run() -> udev_event_execute_rules()
This commit is contained in:
parent
836dcf951c
commit
dcdcb8cc06
@ -97,7 +97,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
udev_device_set_action(dev, action);
|
||||
event = udev_event_new(dev);
|
||||
err = udev_event_run(event, rules);
|
||||
err = udev_event_execute_rules(event, rules);
|
||||
|
||||
/* rules may change/disable the timeout */
|
||||
if (udev_device_get_event_timeout(dev) >= 0)
|
||||
|
@ -142,13 +142,12 @@ static int rename_netif(struct udev_event *event)
|
||||
usleep(1000 * 1000 / 20);
|
||||
}
|
||||
}
|
||||
|
||||
exit:
|
||||
close(sk);
|
||||
return err;
|
||||
}
|
||||
|
||||
int udev_event_run(struct udev_event *event, struct udev_rules *rules)
|
||||
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
|
||||
{
|
||||
struct udev_device *dev = event->dev;
|
||||
int err = 0;
|
||||
|
@ -89,7 +89,7 @@ struct udev_event {
|
||||
struct udev_rules;
|
||||
extern struct udev_event *udev_event_new(struct udev_device *dev);
|
||||
extern void udev_event_unref(struct udev_event *event);
|
||||
extern int udev_event_run(struct udev_event *event, struct udev_rules *rules);
|
||||
extern int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
|
||||
|
||||
/* udev-rules.c */
|
||||
extern struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
|
||||
|
@ -121,7 +121,7 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
|
||||
if (!force)
|
||||
event->test = 1;
|
||||
|
||||
err = udev_event_run(event, rules);
|
||||
err = udev_event_execute_rules(event, rules);
|
||||
|
||||
if (udev_device_get_event_timeout(dev) >= 0)
|
||||
info(udev, "custom event timeout: %i\n", udev_device_get_event_timeout(dev));
|
||||
|
@ -212,7 +212,7 @@ static void event_fork(struct udev_event *event)
|
||||
alarm(UDEV_EVENT_TIMEOUT);
|
||||
|
||||
/* apply rules, create node, symlinks */
|
||||
err = udev_event_run(event, rules);
|
||||
err = udev_event_execute_rules(event, rules);
|
||||
|
||||
/* rules may change/disable the timeout */
|
||||
if (udev_device_get_event_timeout(event->dev) >= 0)
|
||||
|
Loading…
Reference in New Issue
Block a user