X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-dns-rr.c;h=78d9e4a412471458ab1004be2e96724c76614b9c;hb=0eb3cc88504b5d8f740764047ac5162b67992386;hp=c792deda47d6e19bb27dfc05ff04a5e21b127c50;hpb=151226ab4bf276d60d51864330a99f886b923697;p=elogind.git

diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c
index c792deda4..78d9e4a41 100644
--- a/src/resolve/resolved-dns-rr.c
+++ b/src/resolve/resolved-dns-rr.c
@@ -133,7 +133,7 @@ int dns_resource_key_match_cname(const DnsResourceKey *key, const DnsResourceRec
         return dns_name_equal(DNS_RESOURCE_KEY_NAME(rr->key), DNS_RESOURCE_KEY_NAME(key));
 }
 
-unsigned long dns_resource_key_hash_func(const void *i, const uint8_t hash_key[HASH_KEY_SIZE]) {
+static unsigned long dns_resource_key_hash_func(const void *i, const uint8_t hash_key[HASH_KEY_SIZE]) {
         const DnsResourceKey *k = i;
         unsigned long ul;
 
@@ -144,7 +144,7 @@ unsigned long dns_resource_key_hash_func(const void *i, const uint8_t hash_key[H
         return ul;
 }
 
-int dns_resource_key_compare_func(const void *a, const void *b) {
+static int dns_resource_key_compare_func(const void *a, const void *b) {
         const DnsResourceKey *x = a, *y = b;
         int ret;
 
@@ -165,6 +165,11 @@ int dns_resource_key_compare_func(const void *a, const void *b) {
         return 0;
 }
 
+const struct hash_ops dns_resource_key_hash_ops = {
+        .hash = dns_resource_key_hash_func,
+        .compare = dns_resource_key_compare_func
+};
+
 int dns_resource_key_to_string(const DnsResourceKey *key, char **ret) {
         char cbuf[DECIMAL_STR_MAX(uint16_t)], tbuf[DECIMAL_STR_MAX(uint16_t)];
         const char *c, *t;
@@ -365,14 +370,8 @@ int dns_resource_record_equal(const DnsResourceRecord *a, const DnsResourceRecor
                        strcaseeq(a->hinfo.os, b->hinfo.os);
 
         case DNS_TYPE_SPF: /* exactly the same as TXT */
-        case DNS_TYPE_TXT: {
-                int i;
-
-                for (i = 0; a->txt.strings[i] || b->txt.strings[i]; i++)
-                        if (!streq_ptr(a->txt.strings[i], b->txt.strings[i]))
-                                return false;
-                return true;
-        }
+        case DNS_TYPE_TXT:
+                return strv_equal(a->txt.strings, b->txt.strings);
 
         case DNS_TYPE_A:
                 return memcmp(&a->a.in_addr, &b->a.in_addr, sizeof(struct in_addr)) == 0;
@@ -425,13 +424,13 @@ int dns_resource_record_equal(const DnsResourceRecord *a, const DnsResourceRecor
 
         case DNS_TYPE_RRSIG:
                 /* do the fast comparisons first */
-                if (a->rrsig.type_covered != a->rrsig.type_covered ||
-                    a->rrsig.algorithm != a->rrsig.algorithm ||
-                    a->rrsig.labels != a->rrsig.labels ||
-                    a->rrsig.original_ttl != a->rrsig.original_ttl ||
-                    a->rrsig.expiration != a->rrsig.expiration ||
-                    a->rrsig.inception != a->rrsig.inception ||
-                    a->rrsig.key_tag != a->rrsig.key_tag ||
+                if (a->rrsig.type_covered != b->rrsig.type_covered ||
+                    a->rrsig.algorithm != b->rrsig.algorithm ||
+                    a->rrsig.labels != b->rrsig.labels ||
+                    a->rrsig.original_ttl != b->rrsig.original_ttl ||
+                    a->rrsig.expiration != b->rrsig.expiration ||
+                    a->rrsig.inception != b->rrsig.inception ||
+                    a->rrsig.key_tag != b->rrsig.key_tag ||
                     a->rrsig.signature_size != b->rrsig.signature_size ||
                     memcmp(a->rrsig.signature, b->rrsig.signature, a->rrsig.signature_size) != 0)
                         return false;