diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2017-09-29 00:37:23 +0200 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2017-10-02 13:09:54 +0200 |
| commit | 3742095b27f8df4b195d530b52d15bc5fea70bf1 (patch) | |
| tree | 3fc7c3503845b733f1d58366436c0bb672d3613a /src/resolve | |
| parent | man: move non-target units together (#6934) (diff) | |
| download | systemd-3742095b27f8df4b195d530b52d15bc5fea70bf1.tar.xz systemd-3742095b27f8df4b195d530b52d15bc5fea70bf1.zip | |
tree-wide: use IN_SET where possible
In addition to the changes from #6933 this handles cases that could be
matched with the included cocci file.
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/resolved-dns-stub.c | 2 | ||||
| -rw-r--r-- | src/resolve/resolved-dns-synthesize.c | 8 | ||||
| -rw-r--r-- | src/resolve/resolved-dns-transaction.c | 3 | ||||
| -rw-r--r-- | src/resolve/resolved-link.c | 2 | ||||
| -rw-r--r-- | src/resolve/resolved-llmnr.c | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c index 6f7b5ab9e8..292e94daa3 100644 --- a/src/resolve/resolved-dns-stub.c +++ b/src/resolve/resolved-dns-stub.c @@ -467,7 +467,7 @@ static int on_dns_stub_stream(sd_event_source *s, int fd, uint32_t revents, void cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC); if (cfd < 0) { - if (errno == EAGAIN || errno == EINTR) + if (IN_SET(errno, EAGAIN, EINTR)) return 0; return -errno; diff --git a/src/resolve/resolved-dns-synthesize.c b/src/resolve/resolved-dns-synthesize.c index c454f64049..25d2322453 100644 --- a/src/resolve/resolved-dns-synthesize.c +++ b/src/resolve/resolved-dns-synthesize.c @@ -240,21 +240,23 @@ static int synthesize_system_hostname_rr(Manager *m, const DnsResourceKey *key, /* If we have no local addresses then use ::1 * and 127.0.0.2 as local ones. */ - if (af == AF_INET || af == AF_UNSPEC) + if (IN_SET(af, AF_INET, AF_UNSPEC)) buffer[n++] = (struct local_address) { .family = AF_INET, .ifindex = dns_synthesize_ifindex(ifindex), .address.in.s_addr = htobe32(0x7F000002), }; - if (af == AF_INET6 || af == AF_UNSPEC) + if (IN_SET(af, AF_INET6, AF_UNSPEC)) buffer[n++] = (struct local_address) { .family = AF_INET6, .ifindex = dns_synthesize_ifindex(ifindex), .address.in6 = in6addr_loopback, }; - return answer_add_addresses_rr(answer, dns_resource_key_name(key), buffer, n); + return answer_add_addresses_rr(answer, + dns_resource_key_name(key), + buffer, n); } } diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c index 3075f62b5e..8b23132339 100644 --- a/src/resolve/resolved-dns-transaction.c +++ b/src/resolve/resolved-dns-transaction.c @@ -1528,8 +1528,7 @@ int dns_transaction_go(DnsTransaction *t) { af_to_name_short(t->scope->family)); if (!t->initial_jitter_scheduled && - (t->scope->protocol == DNS_PROTOCOL_LLMNR || - t->scope->protocol == DNS_PROTOCOL_MDNS)) { + IN_SET(t->scope->protocol, DNS_PROTOCOL_LLMNR, DNS_PROTOCOL_MDNS)) { usec_t jitter, accuracy; /* RFC 4795 Section 2.7 suggests all queries should be diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index ea3b061877..95795e4d24 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -314,7 +314,7 @@ void link_set_dnssec_mode(Link *l, DnssecMode mode) { assert(l); #ifndef HAVE_GCRYPT - if (mode == DNSSEC_YES || mode == DNSSEC_ALLOW_DOWNGRADE) + if (IN_SET(mode, DNSSEC_YES, DNSSEC_ALLOW_DOWNGRADE)) log_warning("DNSSEC option for the link cannot be enabled or set to allow-downgrade when systemd-resolved is built without gcrypt support. Turning off DNSSEC support."); return; #endif diff --git a/src/resolve/resolved-llmnr.c b/src/resolve/resolved-llmnr.c index 29396e9973..0cf4583572 100644 --- a/src/resolve/resolved-llmnr.c +++ b/src/resolve/resolved-llmnr.c @@ -345,7 +345,7 @@ static int on_llmnr_stream(sd_event_source *s, int fd, uint32_t revents, void *u cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC); if (cfd < 0) { - if (errno == EAGAIN || errno == EINTR) + if (IN_SET(errno, EAGAIN, EINTR)) return 0; return -errno; |