diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-20 23:40:44 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-22 10:54:38 +0100 |
commit | baaa35ad706419ae5aacc11d2bece5bd8b73ee42 (patch) | |
tree | bb4b9c576fc56b3237d59e959ded7c245917fcd7 /src/login/logind-session.c | |
parent | 52d86690d68779b120a4380f7cc740825827fb0d (diff) | |
download | systemd-baaa35ad706419ae5aacc11d2bece5bd8b73ee42.tar.gz |
coccinelle: make use of SYNTHETIC_ERRNO
Ideally, coccinelle would strip unnecessary braces too. But I do not see any
option in coccinelle for this, so instead, I edited the patch text using
search&replace to remove the braces. Unfortunately this is not fully automatic,
in particular it didn't deal well with if-else-if-else blocks and ifdefs, so
there is an increased likelikehood be some bugs in such spots.
I also removed part of the patch that coccinelle generated for udev, where we
returns -1 for failure. This should be fixed independently.
Diffstat (limited to 'src/login/logind-session.c')
-rw-r--r-- | src/login/logind-session.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c index e8be1ffbed..576a17a7f0 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -441,10 +441,10 @@ int session_load(Session *s) { uid_t u; User *user; - if (!uid) { - log_error("UID not specified for session %s", s->id); - return -ENOENT; - } + if (!uid) + return log_error_errno(SYNTHETIC_ERRNO(ENOENT), + "UID not specified for session %s", + s->id); r = parse_uid(uid, &u); if (r < 0) { @@ -453,10 +453,10 @@ int session_load(Session *s) { } user = hashmap_get(s->manager->users, UID_TO_PTR(u)); - if (!user) { - log_error("User of session %s not known.", s->id); - return -ENOENT; - } + if (!user) + return log_error_errno(SYNTHETIC_ERRNO(ENOENT), + "User of session %s not known.", + s->id); session_set_user(s, user); } |