From 442ac1b1b0392aa1a714e3c6508bd91059e1a059 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 12 Apr 2025 23:24:21 +0900 Subject: [PATCH] resolved-dns-trust-anchor: use hash_ops with destructor for managing RRs --- src/resolve/resolved-dns-rr.c | 7 ++++++- src/resolve/resolved-dns-trust-anchor.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c index 7f0bd35d3c7..6837c9ece40 100644 --- a/src/resolve/resolved-dns-rr.c +++ b/src/resolve/resolved-dns-rr.c @@ -1686,7 +1686,12 @@ int dns_resource_record_compare_func(const DnsResourceRecord *x, const DnsResour return CMP(x, y); } -DEFINE_HASH_OPS(dns_resource_record_hash_ops, DnsResourceRecord, dns_resource_record_hash_func, dns_resource_record_compare_func); +DEFINE_HASH_OPS_WITH_KEY_DESTRUCTOR( + dns_resource_record_hash_ops, + DnsResourceRecord, + dns_resource_record_hash_func, + dns_resource_record_compare_func, + dns_resource_record_unref); DEFINE_HASH_OPS_FULL( dns_resource_record_hash_ops_by_key, diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c index 94e0da404bc..ae20f712cbb 100644 --- a/src/resolve/resolved-dns-trust-anchor.c +++ b/src/resolve/resolved-dns-trust-anchor.c @@ -542,7 +542,7 @@ void dns_trust_anchor_flush(DnsTrustAnchor *d) { assert(d); d->positive_by_key = hashmap_free_with_destructor(d->positive_by_key, dns_answer_unref); - d->revoked_by_rr = set_free_with_destructor(d->revoked_by_rr, dns_resource_record_unref); + d->revoked_by_rr = set_free(d->revoked_by_rr); d->negative_by_name = set_free(d->negative_by_name); } -- 2.47.3