udev_event_run() -> udev_event_execute_rules()

diff --git a/udev/test-udev.c b/udev/test-udev.c
index 4f8a7e4f66a2cbf4105ab058206532142080da14..d304a1cc159a96ea8ac5a7a1fb2f4708440c4ada 100644 (file)
--- 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);
 
        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)
 
        /* 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 07c02211a05e2f15d65dbdf723839da78262d0cd..fe4dcec4e1dcf0dadcfe066af70376f65e3fd8ba 100644 (file)
--- 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);
                }
        }
                        usleep(1000 * 1000 / 20);
                }
        }

-

 exit:
        close(sk);
        return err;
 }
 
 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;
 {
        struct udev_device *dev = event->dev;
        int err = 0;

diff --git a/udev/udev.h b/udev/udev.h
index be76fe3ceb67b1a35d8455f26e299658febfd229..d0ffb6cb3119f9fe9d8c4aab3feb34e4bb0f25b4 100644 (file)
--- 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);
 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);
 
 /* 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 c64e0456bb8f83fe0a38e42bf7813529c72dac0a..342b89d08452c8ab9164f05bc66e307509beaa04 100644 (file)
--- 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;
 
        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));
 
        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 d5c12ad56c0258d73507a8a2994de34abb5339de..111f1200062de5d05f3a191323654edd5b2025d7 100644 (file)
--- 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 */
                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)
 
                /* rules may change/disable the timeout */
                if (udev_device_get_event_timeout(event->dev) >= 0)