summaryrefslogtreecommitdiffstats
path: root/src/udev
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2015-11-05 13:44:06 +0100
committerMichal Schmidt <mschmidt@redhat.com>2015-11-05 13:44:06 +0100
commit709f6e46a35ec492b70eb92943d82a8d838ce918 (patch)
tree66f37ebe9d7f2274a886867d2b4c9b2c38183444 /src/udev
parentjournal: fix incorrect errno reporting (diff)
downloadsystemd-709f6e46a35ec492b70eb92943d82a8d838ce918.tar.xz
systemd-709f6e46a35ec492b70eb92943d82a8d838ce918.zip
treewide: use the negative error codes returned by our functions
Our functions return negative error codes. Do not rely on errno being set after calling our own functions.
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev-builtin-uaccess.c2
-rw-r--r--src/udev/udevd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index 7a458063e4..bbda9de08c 100644
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -58,7 +58,7 @@ static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool
r = devnode_acl(path, true, false, 0, true, uid);
if (r < 0) {
- log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, r, "Failed to apply ACL on %s: %m", path);
+ log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, "Failed to apply ACL on %s: %m", path);
goto finish;
}
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 2c152129cc..5364b92a57 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1558,7 +1558,7 @@ static int manager_new(Manager **ret, int fd_ctrl, int fd_uevent, const char *cg
r = sd_event_default(&manager->event);
if (r < 0)
- return log_error_errno(errno, "could not allocate event loop: %m");
+ return log_error_errno(r, "could not allocate event loop: %m");
r = sd_event_add_signal(manager->event, NULL, SIGINT, on_sigterm, manager);
if (r < 0)