Remove src/reply-password

[elogind.git] / src / resolve / resolved-dns-zone.c

diff --git a/src/resolve/resolved-dns-zone.c b/src/resolve/resolved-dns-zone.c
index b53e957d761f321b864cad9a13bd11c3207f0141..a4c9b7d7afad6b1fb64d513c88bb486f5b611c47 100644 (file)
--- a/src/resolve/resolved-dns-zone.c
+++ b/src/resolve/resolved-dns-zone.c
@@ -126,11 +126,11 @@ static int dns_zone_init(DnsZone *z) {
 
         assert(z);
 
-        r = hashmap_ensure_allocated(&z->by_key, dns_resource_key_hash_func, dns_resource_key_compare_func);
+        r = hashmap_ensure_allocated(&z->by_key, &dns_resource_key_hash_ops);
         if (r < 0)
                 return r;
 
-        r = hashmap_ensure_allocated(&z->by_name, dns_name_hash_func, dns_name_compare_func);
+        r = hashmap_ensure_allocated(&z->by_name, &dns_name_hash_ops);
         if (r < 0)
                 return r;
 
@@ -194,7 +194,7 @@ static int dns_zone_item_probe_start(DnsZoneItem *i)  {
                         return r;
         }
 
-        r = set_ensure_allocated(&t->zone_items, NULL, NULL);
+        r = set_ensure_allocated(&t->zone_items, NULL);
         if (r < 0)
                 goto gc;
 
@@ -570,7 +570,7 @@ static int dns_zone_item_verify(DnsZoneItem *i) {
         i->state = DNS_ZONE_ITEM_VERIFYING;
         r = dns_zone_item_probe_start(i);
         if (r < 0) {
-                log_error("Failed to start probing for verifying RR: %s", strerror(-r));
+                log_error_errno(r, "Failed to start probing for verifying RR: %m");
                 i->state = DNS_ZONE_ITEM_ESTABLISHED;
                 return r;
         }