Remove unused DNS_RDATASET_COUNT

Albeit technically not unused, it was always defined as 0 and thus did
nothing.

Related: #4666

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 45e241348be6c53ef0a2521cc9d4f8b4d2484bc4..527557204af3140375b9bb46c1ee513f1918f7e7 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -55,12 +55,7 @@
 #include <dns/types.h>
 
 #define DNS_RDATASET_MAXADDITIONAL 13
-
-/* Fixed RRSet helper macros */
-
-#define DNS_RDATASET_LENGTH 2;
-
-#define DNS_RDATASET_COUNT 0
+#define DNS_RDATASET_LENGTH       2;
 
 typedef enum {
        dns_rdatasetadditional_fromauth,

diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c
index 7056d717683e8efab608a338a6f41a844afb0586..39b0caf2f7e6fd520cd7935254b68616ca7175e2 100644 (file)
--- a/lib/dns/qpzone.c
+++ b/lib/dns/qpzone.c
@@ -1133,7 +1133,7 @@ setnsec3parameters(dns_db_t *db, qpz_version_t *version) {
                         */
                        raw = dns_slabheader_raw(header);
                        count = raw[0] * 256 + raw[1]; /* count */
-                       raw += DNS_RDATASET_COUNT + DNS_RDATASET_LENGTH;
+                       raw += DNS_RDATASET_LENGTH;
                        while (count-- > 0U) {
                                length = raw[0] * 256 + raw[1];
                                raw += DNS_RDATASET_LENGTH;
@@ -2635,7 +2635,7 @@ matchparams(dns_slabheader_t *header, qpz_search_t *search) {
 
        raw = (unsigned char *)header + sizeof(*header);
        count = raw[0] * 256 + raw[1]; /* count */
-       raw += DNS_RDATASET_COUNT + DNS_RDATASET_LENGTH;
+       raw += DNS_RDATASET_LENGTH;
 
        while (count-- > 0) {
                rdlen = raw[0] * 256 + raw[1];