From: Filipe Brandenburger <filbranden@google.com>
Date: Tue, 7 Aug 2018 02:21:38 +0000 (-0700)
Subject: resolve: use CMP() in dns_resource_record_compare_func
X-Git-Tag: v240~856^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53c5797fbde10cb0d133b3b11789fb299411468e;p=thirdparty%2Fsystemd.git

resolve: use CMP() in dns_resource_record_compare_func

This function doesn't really implement ordering, but CMP() is still fine to use
there. Keep the comment in place, just update it slightly to indicate that.
---

diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c
index 05a4915101e..e6d997ed976 100644
--- a/src/resolve/resolved-dns-rr.c
+++ b/src/resolve/resolved-dns-rr.c
@@ -1513,10 +1513,9 @@ static int dns_resource_record_compare_func(const void *a, const void *b) {
         if (dns_resource_record_equal(x, y))
                 return 0;
 
-        /* This is a bit dirty, we don't implement proper ordering, but
-         * the hashtable doesn't need ordering anyway, hence we don't
-         * care. */
-        return x < y ? -1 : 1;
+        /* We still use CMP() here, even though don't implement proper
+         * ordering, since the hashtable doesn't need ordering anyway. */
+        return CMP(x, y);
 }
 
 const struct hash_ops dns_resource_record_hash_ops = {