diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2017-10-04 23:01:32 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-10-04 16:01:32 +0200 |
| commit | 4c701096002fff540d9ddb3b21398c551ac3af78 (patch) | |
| tree | 537e654dc92baa5eed5b6ff69867114384ecfa47 /src/journal/journald-server.c | |
| parent | 6d0aa4db7b33c9ce71b820c76428a1cfd24fb56f (diff) | |
| download | systemd-4c701096002fff540d9ddb3b21398c551ac3af78.tar.gz | |
tree-wide: use IN_SET macro (#6977)
Diffstat (limited to 'src/journal/journald-server.c')
| -rw-r--r-- | src/journal/journald-server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index de643c9149..463a8dd97c 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -317,7 +317,7 @@ static int system_journal_open(Server *s, bool flush_requested) { (void) cache_space_refresh(s, &s->system_storage); patch_min_use(&s->system_storage); } else if (r < 0) { - if (r != -ENOENT && r != -EROFS) + if (!IN_SET(r, -ENOENT, -EROFS)) log_warning_errno(r, "Failed to open system journal: %m"); r = 0; @@ -1620,7 +1620,7 @@ static int server_connect_notify(Server *s) { if (!e) return 0; - if ((e[0] != '@' && e[0] != '/') || e[1] == 0) { + if (!IN_SET(e[0], '@', '/') || e[1] == 0) { log_error("NOTIFY_SOCKET set to an invalid value: %s", e); return -EINVAL; } |