X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-watch.c;h=cbe0c37a4fe8c79309848618e7cf816232bbbb3b;hb=86e6e5d1b4e78d62d1a45539c1de141bc5e839aa;hp=311f5bdf235f3e942a750387791c3d4f2c7a49fb;hpb=f274ece0f76b5709408821e317e87aef76123db6;p=elogind.git diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index 311f5bdf2..cbe0c37a4 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -40,7 +40,7 @@ int udev_watch_init(struct udev *udev) { inotify_fd = inotify_init1(IN_CLOEXEC); if (inotify_fd < 0) - log_error("inotify_init failed: %m\n"); + log_error("inotify_init failed: %m"); return inotify_fd; } @@ -79,7 +79,7 @@ void udev_watch_restore(struct udev *udev) if (dev == NULL) goto unlink; - log_debug("restoring old watch on '%s'\n", udev_device_get_devnode(dev)); + log_debug("restoring old watch on '%s'", udev_device_get_devnode(dev)); udev_watch_begin(udev, dev); udev_device_unref(dev); unlink: @@ -103,10 +103,10 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev) if (inotify_fd < 0) return; - log_debug("adding watch on '%s'\n", udev_device_get_devnode(dev)); + log_debug("adding watch on '%s'", udev_device_get_devnode(dev)); wd = inotify_add_watch(inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE); if (wd < 0) { - log_error("inotify_add_watch(%d, %s, %o) failed: %m\n", + log_error("inotify_add_watch(%d, %s, %o) failed: %m", inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE); return; } @@ -116,7 +116,7 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev) unlink(filename); r = symlink(udev_device_get_id_filename(dev), filename); if (r < 0) - log_error("Failed to create symlink: %m"); + log_error("Failed to create symlink %s: %m", filename); udev_device_set_watch_handle(dev, wd); } @@ -133,7 +133,7 @@ void udev_watch_end(struct udev *udev, struct udev_device *dev) if (wd < 0) return; - log_debug("removing watch on '%s'\n", udev_device_get_devnode(dev)); + log_debug("removing watch on '%s'", udev_device_get_devnode(dev)); inotify_rm_watch(inotify_fd, wd); snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd);