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

Define and use new DNS_RDATASET_COUNT_UNDEFINED equals ISC_UINT32_MAX to make the code more readable

Browse Source
This commit is contained in:
Ondřej Surý
2018-08-06 10:49:43 +02:00
parent afddc2781e
commit e80c26b22e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/dns/rdataset.c
View File

@@ -48,6 +48,8 @@ dns_trust_totext(dns_trust_t trust) {
return (trustnames[trust]); return (trustnames[trust]);
} }
#define DNS_RDATASET_COUNT_UNDEFINED ISC_UINT32_MAX
void void
dns_rdataset_init(dns_rdataset_t *rdataset) { dns_rdataset_init(dns_rdataset_t *rdataset) {
@@ -66,7 +68,7 @@ dns_rdataset_init(dns_rdataset_t *rdataset) {
rdataset->trust = 0; rdataset->trust = 0;
rdataset->covers = 0; rdataset->covers = 0;
rdataset->attributes = 0; rdataset->attributes = 0;
rdataset->count = ISC_UINT32_MAX; rdataset->count = DNS_RDATASET_COUNT_UNDEFINED;
rdataset->private1 = NULL; rdataset->private1 = NULL;
rdataset->private2 = NULL; rdataset->private2 = NULL;
rdataset->private3 = NULL; rdataset->private3 = NULL;
@@ -95,7 +97,7 @@ dns_rdataset_invalidate(dns_rdataset_t *rdataset) {
rdataset->trust = 0; rdataset->trust = 0;
rdataset->covers = 0; rdataset->covers = 0;
rdataset->attributes = 0; rdataset->attributes = 0;
rdataset->count = ISC_UINT32_MAX; rdataset->count = DNS_RDATASET_COUNT_UNDEFINED;
rdataset->private1 = NULL; rdataset->private1 = NULL;
rdataset->private2 = NULL; rdataset->private2 = NULL;
rdataset->private3 = NULL; rdataset->private3 = NULL;
@@ -122,7 +124,7 @@ dns_rdataset_disassociate(dns_rdataset_t *rdataset) {
rdataset->trust = 0; rdataset->trust = 0;
rdataset->covers = 0; rdataset->covers = 0;
rdataset->attributes = 0; rdataset->attributes = 0;
rdataset->count = ISC_UINT32_MAX; rdataset->count = DNS_RDATASET_COUNT_UNDEFINED;
rdataset->private1 = NULL; rdataset->private1 = NULL;
rdataset->private2 = NULL; rdataset->private2 = NULL;
rdataset->private3 = NULL; rdataset->private3 = NULL;
@@ -420,7 +422,9 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
j = 0; j = 0;
} }
if (ISC_UNLIKELY(want_cyclic) && (rdataset->count < ISC_UINT32_MAX)) { if (ISC_UNLIKELY(want_cyclic) &&
(rdataset->count != DNS_RDATASET_COUNT_UNDEFINED))
{
j = rdataset->count % count; j = rdataset->count % count;
} else { /* Otherwise, just start from beginning */ } else { /* Otherwise, just start from beginning */
j = 0; j = 0;