diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-18 15:46:55 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-18 15:46:55 +0200 |
| commit | dcdcb8cc06c044a0429a688266799838e914f88d (patch) | |
| tree | 9237540cea27b3dae53ebaeef0ed4aad262b45ba /udev | |
| parent | 836dcf951c0f6c4f76f7b194d5bb96d1cbb5366f (diff) | |
udev_event_run() -> udev_event_execute_rules()
Diffstat (limited to 'udev')
| -rw-r--r-- | udev/test-udev.c | 2 | ||||
| -rw-r--r-- | udev/udev-event.c | 3 | ||||
| -rw-r--r-- | udev/udev.h | 2 | ||||
| -rw-r--r-- | udev/udevadm-test.c | 2 | ||||
| -rw-r--r-- | udev/udevd.c | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/udev/test-udev.c b/udev/test-udev.c index 4f8a7e4f66..d304a1cc15 100644 --- a/udev/test-udev.c +++ b/udev/test-udev.c @@ -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) diff --git a/udev/udev-event.c b/udev/udev-event.c index 07c02211a0..fe4dcec4e1 100644 --- a/udev/udev-event.c +++ b/udev/udev-event.c @@ -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; diff --git a/udev/udev.h b/udev/udev.h index be76fe3ceb..d0ffb6cb31 100644 --- a/udev/udev.h +++ b/udev/udev.h @@ -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); diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c index c64e0456bb..342b89d084 100644 --- a/udev/udevadm-test.c +++ b/udev/udevadm-test.c @@ -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)); diff --git a/udev/udevd.c b/udev/udevd.c index d5c12ad56c..111f120006 100644 --- a/udev/udevd.c +++ b/udev/udevd.c @@ -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) |