udev: avoid use of uninitialized err

[elogind.git] / src / udev / udevd.c

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index aecd208d40cd99f46a07a5d10d4faa52645d313d..1c9488e457e3f7d4ba551b7086b8b11737571d13 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -267,7 +267,7 @@ static void worker_new(struct event *event)
                         struct udev_event *udev_event;
                         struct worker_message msg;
                         int fd_lock = -1;
                         struct udev_event *udev_event;
                         struct worker_message msg;
                         int fd_lock = -1;

-                        int err;
+                        int err = 0;

 
                         log_debug("seq %llu running", udev_device_get_seqnum(dev));
                         udev_event = udev_event_new(dev);
 
                         log_debug("seq %llu running", udev_device_get_seqnum(dev));
                         udev_event = udev_event_new(dev);


@@ -307,13 +307,12 @@ static void worker_new(struct event *event)
                         }
 
                         /* apply rules, create node, symlinks */
                         }
 
                         /* apply rules, create node, symlinks */

-                        err = udev_event_execute_rules(udev_event, rules, &sigmask_orig);
+                        udev_event_execute_rules(udev_event, rules, &sigmask_orig);

 
 

-                        if (err == 0)
-                                udev_event_execute_run(udev_event, &sigmask_orig);
+                        udev_event_execute_run(udev_event, &sigmask_orig);

 
                         /* apply/restore inotify watch */
 
                         /* apply/restore inotify watch */

-                        if (err == 0 && udev_event->inotify_watch) {
+                        if (udev_event->inotify_watch) {

                                 udev_watch_begin(udev, dev);
                                 udev_device_update_db(dev);
                         }
                                 udev_watch_begin(udev, dev);
                                 udev_device_update_db(dev);
                         }