summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-06-20 21:59:17 +0200
committerLennart Poettering <lennart@poettering.net>2016-06-21 13:20:48 +0200
commit2a3900d7e484faefb14fd868d5c17ae2e7b2f21f (patch)
tree12f6ea7252995d0bb37063577b9c8576c0cae71d
parentf2ed4c696a39d746ea2d47dec105f19e59f5a9c4 (diff)
resolved: use DNS_{QUESTION|ANSWER}_FOREACH macros at two more places
-rw-r--r--src/resolve/resolved-dns-scope.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index 275189aeb7..66e763cb7d 100644
--- a/src/resolve/resolved-dns-scope.c
+++ b/src/resolve/resolved-dns-scope.c
@@ -654,17 +654,17 @@ static int dns_scope_make_reply_packet(
}
static void dns_scope_verify_conflicts(DnsScope *s, DnsPacket *p) {
- unsigned n;
+ DnsResourceRecord *rr;
+ DnsResourceKey *key;
assert(s);
assert(p);
- if (p->question)
- for (n = 0; n < p->question->n_keys; n++)
- dns_zone_verify_conflicts(&s->zone, p->question->keys[n]);
- if (p->answer)
- for (n = 0; n < p->answer->n_rrs; n++)
- dns_zone_verify_conflicts(&s->zone, p->answer->items[n].rr->key);
+ DNS_QUESTION_FOREACH(key, p->question)
+ dns_zone_verify_conflicts(&s->zone, key);
+
+ DNS_ANSWER_FOREACH(rr, p->answer)
+ dns_zone_verify_conflicts(&s->zone, rr->key);
}
void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {