mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fanf-rdataslab-cpp' into 'main'

Browse Source 
Two small preprocessor cleanups in rdataslab.c

See merge request isc-projects/bind9!6221
This commit is contained in:
Tony Finch
2022-05-03 09:30:48 +00:00
parent 476fef78a9 8c26cd915b
commit d16e9117b0
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/dns/include/dns/rdataslab.h
View File

@@ -53,12 +53,6 @@ ISC_LANG_BEGINDECLS
#define DNS_RDATASLAB_EXACT 0x2
#define DNS_RDATASLAB_OFFLINE 0x01 /* RRSIG is for offline DNSKEY */
#define DNS_RDATASLAB_WARNMASK \
0x0E /*%< RRSIG(DNSKEY) expired \
* warnings number mask. */
#define DNS_RDATASLAB_WARNSHIFT \
1 /*%< How many bits to shift to find \
* remaining expired warning number. */
/***
*** Functions

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;