Commit c21e9f1a authored by Mark Andrews's avatar Mark Andrews
Browse files

add and deserialize are structure element names

parent ef117da2
......@@ -155,7 +155,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
......@@ -188,7 +188,7 @@ typedef isc_uint64_t rbtdb_serial_t;
#define delete_callback delete_callback64
#define delete_node delete_node64
#define deleterdataset deleterdataset64
#define deserialize deserialize64
#define deserialize32 deserialize64
#define detach detach64
#define detachnode detachnode64
#define dump dump64
......@@ -6022,9 +6022,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;
......@@ -6757,8 +6757,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;
......@@ -7007,8 +7007,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);
......@@ -7220,8 +7220,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;
......@@ -7286,7 +7286,7 @@ rbt_datafixer(dns_rbtnode_t *rbtnode, void *base, size_t filesize,
* Load the RBT database from the image in 'f'
*/
static isc_result_t
deserialize(void *arg, FILE *f, off_t offset) {
deserialize32(void *arg, FILE *f, off_t offset) {
isc_result_t result;
rbtdb_load_t *loadctx = arg;
dns_rbtdb_t *rbtdb = loadctx->rbtdb;
......@@ -7420,7 +7420,7 @@ beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) {
callbacks->add = loading_addrdataset;
callbacks->add_private = loadctx;
callbacks->deserialize = deserialize;
callbacks->deserialize = deserialize32;
callbacks->deserialize_private = loadctx;
return (ISC_R_SUCCESS);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment