summaryrefslogtreecommitdiff
path: root/src/resolve
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2022-08-12 16:13:05 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2023-01-08 16:31:15 +0100
commitcc232fa09407eb027db6a3a28451c25dad3ef7aa (patch)
tree8429bfeef6a574ab32991c64b341c17c9f598e1e /src/resolve
parentd80463ea2fb1445a66cfb9d06854162ab385ec66 (diff)
downloadsystemd-cc232fa09407eb027db6a3a28451c25dad3ef7aa.tar.gz
basic: Use statement expressions more in list.h
Let's use statement expressions to return values instead of passing in return arguments to the LIST macros.
Diffstat (limited to 'src/resolve')
-rw-r--r--src/resolve/resolved-dns-search-domain.c4
-rw-r--r--src/resolve/resolved-dns-server.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resolve/resolved-dns-search-domain.c b/src/resolve/resolved-dns-search-domain.c
index 647c0bd1f9..a11b21350a 100644
--- a/src/resolve/resolved-dns-search-domain.c
+++ b/src/resolve/resolved-dns-search-domain.c
@@ -123,13 +123,13 @@ void dns_search_domain_move_back_and_unmark(DnsSearchDomain *d) {
case DNS_SEARCH_DOMAIN_LINK:
assert(d->link);
- LIST_FIND_TAIL(domains, d, tail);
+ tail = LIST_FIND_TAIL(domains, d);
LIST_REMOVE(domains, d->link->search_domains, d);
LIST_INSERT_AFTER(domains, d->link->search_domains, tail, d);
break;
case DNS_SEARCH_DOMAIN_SYSTEM:
- LIST_FIND_TAIL(domains, d, tail);
+ tail = LIST_FIND_TAIL(domains, d);
LIST_REMOVE(domains, d->manager->search_domains, d);
LIST_INSERT_AFTER(domains, d->manager->search_domains, tail, d);
break;
diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
index 8ff513fa33..342a90abcb 100644
--- a/src/resolve/resolved-dns-server.c
+++ b/src/resolve/resolved-dns-server.c
@@ -195,19 +195,19 @@ void dns_server_move_back_and_unmark(DnsServer *s) {
case DNS_SERVER_LINK:
assert(s->link);
- LIST_FIND_TAIL(servers, s, tail);
+ tail = LIST_FIND_TAIL(servers, s);
LIST_REMOVE(servers, s->link->dns_servers, s);
LIST_INSERT_AFTER(servers, s->link->dns_servers, tail, s);
break;
case DNS_SERVER_SYSTEM:
- LIST_FIND_TAIL(servers, s, tail);
+ tail = LIST_FIND_TAIL(servers, s);
LIST_REMOVE(servers, s->manager->dns_servers, s);
LIST_INSERT_AFTER(servers, s->manager->dns_servers, tail, s);
break;
case DNS_SERVER_FALLBACK:
- LIST_FIND_TAIL(servers, s, tail);
+ tail = LIST_FIND_TAIL(servers, s);
LIST_REMOVE(servers, s->manager->fallback_dns_servers, s);
LIST_INSERT_AFTER(servers, s->manager->fallback_dns_servers, tail, s);
break;