From 8ae151e5dbd8399cc2c4826df2d68afeb863285f 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/config.c | 4 +++- bin/named/include/named/config.h | 5 +++-- lib/dns/include/dns/rbt.h | 4 ++-- lib/dns/include/dns/zt.h | 2 +- lib/dns/rbt.c | 4 ++-- lib/dns/zt.c | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/bin/named/config.c b/bin/named/config.c index 4798272ac3..8de06120ab 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -288,7 +288,9 @@ ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf) { } isc_result_t -ns_config_get(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) { +ns_config_get(cfg_obj_t const * const *maps, const char *name, + const cfg_obj_t **obj) +{ int i; for (i = 0;; i++) { diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h index c16c800fe1..82125e264f 100644 --- a/bin/named/include/named/config.h +++ b/bin/named/include/named/config.h @@ -31,10 +31,11 @@ isc_result_t ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf); isc_result_t -ns_config_get(const cfg_obj_t **maps, const char* name, const cfg_obj_t **obj); +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 490cf6f8b7..689d48c0ed 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -369,7 +369,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'. @@ -408,7 +408,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 cf8cd91ca1..d822e8a3a2 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -745,7 +745,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) @@ -1249,7 +1249,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 33c974b1d9..2026343669 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -156,7 +156,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;