From 659ce8e95fd03187b8dcd15b282396cb79dc9762 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Mon, 11 Apr 2022 12:34:47 +0100 Subject: [PATCH] Tidy up some DNS_RDATASET_FIXED conditional compilation Add a #if to make it clear that struct xrdata->order is only used in DNS_RDATASET_FIXED mode. Re-order some variable declarations to merge two #if blocks into one. --- lib/dns/rdataslab.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c index c52101c381..9aed0ad4f1 100644 --- a/lib/dns/rdataslab.c +++ b/lib/dns/rdataslab.c @@ -70,7 +70,9 @@ struct xrdata { dns_rdata_t rdata; +#if DNS_RDATASET_FIXED unsigned int order; +#endif /* if DNS_RDATASET_FIXED */ }; /*% Note: the "const void *" are just to make qsort happy. */ @@ -122,18 +124,16 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx, static unsigned char removed; struct xrdata *x; unsigned char *rawbuf; -#if DNS_RDATASET_FIXED - unsigned char *offsetbase; -#endif /* if DNS_RDATASET_FIXED */ unsigned int buflen; isc_result_t result; unsigned int nitems; unsigned int nalloc; + unsigned int length; unsigned int i; #if DNS_RDATASET_FIXED + unsigned char *offsetbase; unsigned int *offsettable; #endif /* if DNS_RDATASET_FIXED */ - unsigned int length; buflen = reservelen + 2;