ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Tidy up some DNS_RDATASET_FIXED conditional compilation

Browse Source 
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.
This commit is contained in:
Tony Finch
2022-04-11 12:34:47 +01:00
parent e64fa8507a
commit 659ce8e95f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/dns/rdataslab.c
View File

@@ -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;