From: Thomas Hindoe Paaboel Andersen Date: Fri, 16 May 2014 21:46:48 +0000 (+0200) Subject: udev: avoid use of uninitialized err X-Git-Tag: v213~109 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=bf9bead187802a52a1f376a03caee762d663e945;hp=4723e4b2a4ca7a7df449ab2377770301cce6abf7 udev: avoid use of uninitialized err After 1ea972174baba40dbc80c51cbfc4edc49764b59b err is no longer set unless we hit a special case. Initialize it to 0 and remove a check that will never fail. --- diff --git a/src/udev/udevd.c b/src/udev/udevd.c index bc0696c0e..1c9488e45 100644 --- 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; - int err; + int err = 0; log_debug("seq %llu running", udev_device_get_seqnum(dev)); udev_event = udev_event_new(dev); @@ -312,7 +312,7 @@ static void worker_new(struct event *event) udev_event_execute_run(udev_event, &sigmask_orig); /* 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); }