From 60079a5c0a70bd4c3199aa3b5b5f4248eddf8f6c Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 25 Jun 2014 09:45:53 +1000 Subject: [PATCH] add is a structure element name (cherry picked from commit c21e9f1a92de5884520fe30257c0b8fd81dc311b) --- lib/dns/rbtdb.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index fb922dadc6..c3d29f76f1 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -101,7 +101,7 @@ typedef isc_uint64_t rbtdb_serial_t; #define acache_callback acache_callback64 #define acache_cancelentry acache_cancelentry64 #define activeempty activeempty64 -#define add add64 +#define add32 add64 #define add_changed add_changed64 #define add_empty_wildcards add_empty_wildcards64 #define add_wildcard_magic add_wildcard_magic64 @@ -6014,9 +6014,9 @@ resign_delete(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, } static isc_result_t -add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, - rdatasetheader_t *newheader, unsigned int options, isc_boolean_t loading, - dns_rdataset_t *addedrdataset, isc_stdtime_t now) +add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, + rdatasetheader_t *newheader, unsigned int options, isc_boolean_t loading, + dns_rdataset_t *addedrdataset, isc_stdtime_t now) { rbtdb_changed_t *changed = NULL; rdatasetheader_t *topheader, *topheader_prev, *header, *sigheader; @@ -6748,8 +6748,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } if (result == ISC_R_SUCCESS) - result = add(rbtdb, rbtnode, rbtversion, newheader, options, - ISC_FALSE, addedrdataset, now); + result = add32(rbtdb, rbtnode, rbtversion, newheader, options, + ISC_FALSE, addedrdataset, now); if (result == ISC_R_SUCCESS && delegating) rbtnode->find_callback = 1; @@ -6995,8 +6995,8 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, NODE_LOCK(&rbtdb->node_locks[rbtnode->locknum].lock, isc_rwlocktype_write); - result = add(rbtdb, rbtnode, rbtversion, newheader, DNS_DBADD_FORCE, - ISC_FALSE, NULL, 0); + result = add32(rbtdb, rbtnode, rbtversion, newheader, DNS_DBADD_FORCE, + ISC_FALSE, NULL, 0); NODE_UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock, isc_rwlocktype_write); @@ -7190,8 +7190,8 @@ loading_addrdataset(void *arg, dns_name_t *name, dns_rdataset_t *rdataset) { } else newheader->resign = 0; - result = add(rbtdb, node, rbtdb->current_version, newheader, - DNS_DBADD_MERGE, ISC_TRUE, NULL, 0); + result = add32(rbtdb, node, rbtdb->current_version, newheader, + DNS_DBADD_MERGE, ISC_TRUE, NULL, 0); if (result == ISC_R_SUCCESS && delegating_type(rbtdb, node, rdataset->type)) node->find_callback = 1;