From 17c01907d6231b4bcdfac3f38c8f0631ff856e84 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 16 Jun 2016 21:35:18 +1000 Subject: [PATCH] backport dns_name_t *name -> const dns_name_t *name (cherry picked from commit ded95d497df16579852356fc5434671d24c7f00d) --- bin/named/include/named/config.h | 4 ++-- lib/dns/include/dns/rbt.h | 4 ++-- lib/dns/include/dns/zt.h | 2 +- lib/dns/rbt.c | 4 ++-- lib/dns/zt.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h index 5302c9b29f..7a77a3f02d 100644 --- a/bin/named/include/named/config.h +++ b/bin/named/include/named/config.h @@ -31,11 +31,11 @@ isc_result_t ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf); isc_result_t -ns_config_get(cfg_obj_t const * const *maps, const char* name, +ns_config_get(cfg_obj_t const * const *maps, const char *name, const cfg_obj_t **obj); isc_result_t -ns_checknames_get(const cfg_obj_t **maps, const char* name, +ns_checknames_get(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj); int diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h index ef45840d12..8129450d5b 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -391,7 +391,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep); */ isc_result_t -dns_rbt_findname(dns_rbt_t *rbt, dns_name_t *name, unsigned int options, +dns_rbt_findname(dns_rbt_t *rbt, const dns_name_t *name, unsigned int options, dns_name_t *foundname, void **data); /*%< * Get the data pointer associated with 'name'. @@ -430,7 +430,7 @@ dns_rbt_findname(dns_rbt_t *rbt, dns_name_t *name, unsigned int options, */ isc_result_t -dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, +dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, dns_rbtnode_t **node, dns_rbtnodechain_t *chain, unsigned int options, dns_rbtfindcallback_t callback, void *callback_arg); diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h index f91d7e8dbe..6e5868ce71 100644 --- a/lib/dns/include/dns/zt.h +++ b/lib/dns/include/dns/zt.h @@ -90,7 +90,7 @@ dns_zt_unmount(dns_zt_t *zt, dns_zone_t *zone); */ isc_result_t -dns_zt_find(dns_zt_t *zt, dns_name_t *name, unsigned int options, +dns_zt_find(dns_zt_t *zt, const dns_name_t *name, unsigned int options, dns_name_t *foundname, dns_zone_t **zone); /*%< * Find the best match for 'name' in 'zt'. If foundname is non NULL diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index 8b6a699216..92d4aca885 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -1457,7 +1457,7 @@ dns_rbt_addname(dns_rbt_t *rbt, dns_name_t *name, void *data) { * Find the node for "name" in the tree of trees. */ isc_result_t -dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, +dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, dns_rbtnode_t **node, dns_rbtnodechain_t *chain, unsigned int options, dns_rbtfindcallback_t callback, void *callback_arg) @@ -1988,7 +1988,7 @@ dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, * Get the data pointer associated with 'name'. */ isc_result_t -dns_rbt_findname(dns_rbt_t *rbt, dns_name_t *name, unsigned int options, +dns_rbt_findname(dns_rbt_t *rbt, const dns_name_t *name, unsigned int options, dns_name_t *foundname, void **data) { dns_rbtnode_t *node = NULL; isc_result_t result; diff --git a/lib/dns/zt.c b/lib/dns/zt.c index ffc76bbeb5..9079d367f7 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -155,7 +155,7 @@ dns_zt_unmount(dns_zt_t *zt, dns_zone_t *zone) { } isc_result_t -dns_zt_find(dns_zt_t *zt, dns_name_t *name, unsigned int options, +dns_zt_find(dns_zt_t *zt, const dns_name_t *name, unsigned int options, dns_name_t *foundname, dns_zone_t **zonep) { isc_result_t result;