From 472379925cff82402a56cda331bff569cf58b81a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 8 May 2025 05:53:23 +0900 Subject: [PATCH] resolve: use set_put_strdup_full() to specify hash_ops --- src/resolve/resolved-link-bus.c | 6 +----- src/resolve/resolved-link.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c index 8b4e492e88..9c5f7a836a 100644 --- a/src/resolve/resolved-link-bus.c +++ b/src/resolve/resolved-link-bus.c @@ -675,10 +675,6 @@ int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, v if (r < 0) return r; - ns = set_new(&dns_name_hash_ops_free); - if (!ns) - return -ENOMEM; - r = sd_bus_message_read_strv(message, &ntas); if (r < 0) return r; @@ -691,7 +687,7 @@ int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, v return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid negative trust anchor domain: %s", *i); - r = set_put_strdup(&ns, *i); + r = set_put_strdup_full(&ns, &dns_name_hash_ops_free, *i); if (r < 0) return r; diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index 2a9d606bb4..1e2d95b4ea 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -477,11 +477,7 @@ static int link_update_dnssec_negative_trust_anchors(Link *l) { if (r < 0) return r; - ns = set_new(&dns_name_hash_ops_free); - if (!ns) - return -ENOMEM; - - r = set_put_strdupv(&ns, ntas); + r = set_put_strdupv_full(&ns, &dns_name_hash_ops_free, ntas); if (r < 0) return r;