Commit 67d3afc4 authored by James Brister's avatar James Brister
Browse files

Renamed many identifiers to match coding guidelines.

parent f104fbbe
......@@ -23,16 +23,16 @@
#include <dns/confcommon.h>
static isc_result_t expand_acls(dns_c_acl_table_t *table,
dns_c_ipmatch_list_t *list);
static isc_result_t expand_acls(dns_c_acltable_t *table,
dns_c_ipmatchlist_t *list);
static isc_result_t acl_delete(dns_c_acl_t **aclptr);
isc_result_t
dns_c_acl_table_new(isc_mem_t *mem, dns_c_acl_table_t **newtable)
dns_c_acltable_new(isc_mem_t *mem, dns_c_acltable_t **newtable)
{
dns_c_acl_table_t *table;
dns_c_acltable_t *table;
REQUIRE(mem != NULL);
REQUIRE(newtable != NULL);
......@@ -54,9 +54,9 @@ dns_c_acl_table_new(isc_mem_t *mem, dns_c_acl_table_t **newtable)
isc_result_t
dns_c_acl_table_delete(dns_c_acl_table_t **table)
dns_c_acltable_delete(dns_c_acltable_t **table)
{
dns_c_acl_table_t *acltable;
dns_c_acltable_t *acltable;
REQUIRE(table != NULL);
......@@ -65,7 +65,7 @@ dns_c_acl_table_delete(dns_c_acl_table_t **table)
return (ISC_R_SUCCESS);
}
dns_c_acl_table_clear(acltable);
dns_c_acltable_clear(acltable);
isc_mem_put(acltable->mem, acltable, sizeof *acltable);
......@@ -74,7 +74,7 @@ dns_c_acl_table_delete(dns_c_acl_table_t **table)
void
dns_c_acl_table_print(FILE *fp, int indent, dns_c_acl_table_t *table)
dns_c_acltable_print(FILE *fp, int indent, dns_c_acltable_t *table)
{
dns_c_acl_t *acl;
dns_c_acl_t *acltmp;
......@@ -101,7 +101,7 @@ dns_c_acl_table_print(FILE *fp, int indent, dns_c_acl_table_t *table)
isc_result_t
dns_c_acl_table_clear(dns_c_acl_table_t *table)
dns_c_acltable_clear(dns_c_acltable_t *table)
{
dns_c_acl_t *elem;
dns_c_acl_t *tmpelem;
......@@ -128,7 +128,7 @@ dns_c_acl_table_clear(dns_c_acl_table_t *table)
isc_result_t
dns_c_acl_table_get_acl(dns_c_acl_table_t *table,
dns_c_acltable_getacl(dns_c_acltable_t *table,
const char *aclname,
dns_c_acl_t **retval)
{
......@@ -157,7 +157,7 @@ dns_c_acl_table_get_acl(dns_c_acl_table_t *table,
isc_result_t
dns_c_acl_table_remove_acl(dns_c_acl_table_t *table, const char *aclname)
dns_c_acltable_removeacl(dns_c_acltable_t *table, const char *aclname)
{
dns_c_acl_t *acl;
dns_c_acl_t *tmpacl;
......@@ -182,7 +182,7 @@ dns_c_acl_table_remove_acl(dns_c_acl_table_t *table, const char *aclname)
isc_result_t
dns_c_acl_new(dns_c_acl_table_t *table, const char *aclname,
dns_c_acl_new(dns_c_acltable_t *table, const char *aclname,
isc_boolean_t isspecial, dns_c_acl_t **newacl)
{
dns_c_acl_t *acl;
......@@ -229,7 +229,7 @@ dns_c_acl_print(FILE *fp, int indent, dns_c_acl_t *acl)
}
if (acl->ipml != NULL) {
dns_c_ipmatch_list_print(fp, indent + 1, acl->ipml);
dns_c_ipmatchlist_print(fp, indent + 1, acl->ipml);
} else {
fprintf(fp, "{\n");
dns_c_printtabs(fp, indent);
......@@ -239,7 +239,7 @@ dns_c_acl_print(FILE *fp, int indent, dns_c_acl_t *acl)
isc_result_t
dns_c_acl_set_ipml(dns_c_acl_t *acl, dns_c_ipmatch_list_t *ipml,
dns_c_acl_setipml(dns_c_acl_t *acl, dns_c_ipmatchlist_t *ipml,
isc_boolean_t deepcopy)
{
isc_result_t res;
......@@ -248,11 +248,11 @@ dns_c_acl_set_ipml(dns_c_acl_t *acl, dns_c_ipmatch_list_t *ipml,
REQUIRE(ipml != NULL);
if (acl->ipml != NULL) {
dns_c_ipmatch_list_delete(&acl->ipml);
dns_c_ipmatchlist_delete(&acl->ipml);
}
if (deepcopy) {
res = dns_c_ipmatch_list_copy(acl->mytable->mem,
res = dns_c_ipmatchlist_copy(acl->mytable->mem,
&acl->ipml, ipml);
} else {
acl->ipml = ipml;
......@@ -264,17 +264,17 @@ dns_c_acl_set_ipml(dns_c_acl_t *acl, dns_c_ipmatch_list_t *ipml,
isc_result_t
dns_c_acl_get_ipml_expanded(isc_mem_t *mem, dns_c_acl_t *acl,
dns_c_ipmatch_list_t **retval)
dns_c_acl_getipmlexpanded(isc_mem_t *mem, dns_c_acl_t *acl,
dns_c_ipmatchlist_t **retval)
{
dns_c_ipmatch_list_t *newlist;
dns_c_ipmatchlist_t *newlist;
isc_result_t r;
if (acl->ipml == NULL) {
newlist = NULL;
r = ISC_R_SUCCESS;
} else {
r = dns_c_ipmatch_list_copy(mem, &newlist, acl->ipml);
r = dns_c_ipmatchlist_copy(mem, &newlist, acl->ipml);
if (r != ISC_R_SUCCESS) {
return (r);
}
......@@ -289,10 +289,10 @@ dns_c_acl_get_ipml_expanded(isc_mem_t *mem, dns_c_acl_t *acl,
static isc_result_t
expand_acls(dns_c_acl_table_t *table, dns_c_ipmatch_list_t *list)
expand_acls(dns_c_acltable_t *table, dns_c_ipmatchlist_t *list)
{
dns_c_ipmatch_element_t *elem;
dns_c_ipmatch_element_t *tmpelem;
dns_c_ipmatchelement_t *elem;
dns_c_ipmatchelement_t *tmpelem;
dns_c_acl_t *acl;
isc_result_t r;
isc_boolean_t isneg;
......@@ -309,15 +309,15 @@ expand_acls(dns_c_acl_table_t *table, dns_c_ipmatch_list_t *list)
break;
case dns_c_ipmatch_acl:
r = dns_c_acl_table_get_acl(table,
r = dns_c_acltable_getacl(table,
elem->u.aclname, &acl);
if (r != ISC_R_SUCCESS) {
return (ISC_R_FAILURE);
}
if (acl->ipml != NULL) {
isneg = dns_c_ipmatch_element_isneg(elem);
dns_c_ipmatch_list_append(list,
isneg = dns_c_ipmatchelement_isneg(elem);
dns_c_ipmatchlist_append(list,
acl->ipml, isneg);
}
......@@ -353,7 +353,7 @@ acl_delete(dns_c_acl_t **aclptr)
}
isc_mem_free(acl->mytable->mem, acl->name);
res = dns_c_ipmatch_list_delete(&acl->ipml);
res = dns_c_ipmatchlist_delete(&acl->ipml);
isc_mem_put(acl->mytable->mem, acl, sizeof *acl);
return (res);
......
......@@ -55,7 +55,7 @@ static struct dns_c_pvt_ont {
static struct dns_c_pvt_lsnt {
dns_c_log_severity_t val;
dns_c_logseverity_t val;
const char *strval;
} log_severity_nametable[] = {
{ dns_c_log_critical, "critical" },
......@@ -115,13 +115,13 @@ static struct dns_c_pvt_cntable {
{ dns_c_cat_config, "config" },
{ dns_c_cat_parser, "parser" },
{ dns_c_cat_queries, "queries" },
{ dns_c_cat_lame_servers, "lame-servers" },
{ dns_c_cat_lameservers, "lame-servers" },
{ dns_c_cat_statistics, "statistics" },
{ dns_c_cat_panic, "panic" },
{ dns_c_cat_update, "update" },
{ dns_c_cat_ncache, "ncache" },
{ dns_c_cat_xfer_in, "xfer-in" },
{ dns_c_cat_xfer_out, "xfer-out" },
{ dns_c_cat_xferin, "xfer-in" },
{ dns_c_cat_xferout, "xfer-out" },
{ dns_c_cat_db, "db" },
{ dns_c_cat_eventlib, "eventlib" },
{ dns_c_cat_packet, "packet" },
......@@ -132,7 +132,7 @@ static struct dns_c_pvt_cntable {
{ dns_c_cat_insist, "insist" },
{ dns_c_cat_maint, "maintenance" },
{ dns_c_cat_load, "load" },
{ dns_c_cat_resp_checks, "response-checks" },
{ dns_c_cat_respchecks, "response-checks" },
{ dns_c_cat_control, "control" },
{ 0, NULL }
};
......@@ -160,7 +160,7 @@ static void default_cfgerror(isc_result_t result, const char *fmt,
void
dns_c_print_in_units(FILE *fp, isc_uint32_t val)
dns_c_printinunits(FILE *fp, isc_uint32_t val)
{
isc_uint32_t one_gig = (1024 * 1024 * 1024);
isc_uint32_t one_meg = (1024 * 1024);
......@@ -182,7 +182,7 @@ dns_c_print_in_units(FILE *fp, isc_uint32_t val)
void
dns_c_dataclass_to_stream(FILE *fp, dns_rdataclass_t rclass)
dns_c_dataclass_tostream(FILE *fp, dns_rdataclass_t rclass)
{
char buffer[64];
isc_buffer_t sourceb;
......@@ -201,7 +201,7 @@ dns_c_dataclass_to_stream(FILE *fp, dns_rdataclass_t rclass)
void
dns_c_datatype_to_stream(FILE *fp, dns_rdatatype_t rtype)
dns_c_datatype_tostream(FILE *fp, dns_rdatatype_t rtype)
{
char buffer[64];
isc_buffer_t sourceb;
......@@ -266,7 +266,7 @@ dns_c_ordering2string(dns_c_ordering_t ordering, isc_boolean_t printable)
const char *
dns_c_logseverity2string(dns_c_log_severity_t severity,
dns_c_logseverity2string(dns_c_logseverity_t severity,
isc_boolean_t printable)
{
int i;
......@@ -284,7 +284,7 @@ dns_c_logseverity2string(dns_c_log_severity_t severity,
isc_result_t
dns_c_string2logseverity(const char *string, dns_c_log_severity_t *result)
dns_c_string2logseverity(const char *string, dns_c_logseverity_t *result)
{
int i;
isc_result_t rval = ISC_R_FAILURE;
......@@ -458,11 +458,11 @@ dns_c_forward2string(dns_c_forw_t forw, isc_boolean_t printable)
rval = "first";
break;
case dns_c_forw_no_answer:
case dns_c_forw_noanswer:
rval = "if-no-answer";
break;
case dns_c_forw_no_domain:
case dns_c_forw_nodomain:
rval = "if-no-domain";
break;
}
......@@ -517,7 +517,7 @@ dns_c_need_quote(const char *string)
static dns_cfg_err_handler_t cfgerrorptr = default_cfgerror;
dns_cfg_err_handler_t
dns_c_set_error_handler(dns_cfg_err_handler_t newhandler)
dns_c_seterrorhandler(dns_cfg_err_handler_t newhandler)
{
dns_cfg_err_handler_t oldhandler = cfgerrorptr;
......
......@@ -27,11 +27,11 @@
isc_result_t
dns_c_ctrl_list_delete(dns_c_ctrl_list_t **list)
dns_c_ctrllist_delete(dns_c_ctrllist_t **list)
{
dns_c_ctrl_t *ctrl;
dns_c_ctrl_t *tmpctrl;
dns_c_ctrl_list_t *clist;
dns_c_ctrllist_t *clist;
REQUIRE(list != NULL);
clist = *list;
......@@ -55,9 +55,9 @@ dns_c_ctrl_list_delete(dns_c_ctrl_list_t **list)
isc_result_t
dns_c_ctrl_inet_new(isc_mem_t *mem, dns_c_ctrl_t **control,
dns_c_ctrlinet_new(isc_mem_t *mem, dns_c_ctrl_t **control,
dns_c_addr_t addr, short port,
dns_c_ipmatch_list_t *iml, isc_boolean_t copy)
dns_c_ipmatchlist_t *iml, isc_boolean_t copy)
{
dns_c_ctrl_t *ctrl;
isc_result_t res;
......@@ -76,7 +76,7 @@ dns_c_ctrl_inet_new(isc_mem_t *mem, dns_c_ctrl_t **control,
ctrl->u.inet_v.port = port;
if (copy) {
res = dns_c_ipmatch_list_copy(mem, &ctrl->u.inet_v.matchlist,
res = dns_c_ipmatchlist_copy(mem, &ctrl->u.inet_v.matchlist,
iml);
if (res != ISC_R_SUCCESS) {
isc_mem_put(mem, ctrl, sizeof *ctrl);
......@@ -93,7 +93,7 @@ dns_c_ctrl_inet_new(isc_mem_t *mem, dns_c_ctrl_t **control,
isc_result_t
dns_c_ctrl_unix_new(isc_mem_t *mem, dns_c_ctrl_t **control,
dns_c_ctrlunix_new(isc_mem_t *mem, dns_c_ctrl_t **control,
const char *path, int perm, uid_t uid, gid_t gid)
{
dns_c_ctrl_t *ctrl;
......@@ -143,7 +143,7 @@ dns_c_ctrl_delete(dns_c_ctrl_t **control)
switch (ctrl->control_type) {
case dns_c_inet_control:
res = dns_c_ipmatch_list_delete(&ctrl->u.inet_v.matchlist);
res = dns_c_ipmatchlist_delete(&ctrl->u.inet_v.matchlist);
break;
case dns_c_unix_control:
......@@ -166,7 +166,7 @@ void
dns_c_ctrl_print(FILE *fp, int indent, dns_c_ctrl_t *ctl)
{
short port;
dns_c_ipmatch_list_t *iml;
dns_c_ipmatchlist_t *iml;
(void) indent;
......@@ -193,7 +193,7 @@ dns_c_ctrl_print(FILE *fp, int indent, dns_c_ctrl_t *ctl)
}
dns_c_printtabs(fp, indent + 1);
fprintf(fp, "allow ");
dns_c_ipmatch_list_print(fp, indent + 2, iml);
dns_c_ipmatchlist_print(fp, indent + 2, iml);
} else {
fprintf(fp, "unix \"%s\" perm %#o owner %d group %d;\n",
ctl->u.unix_v.pathname,
......@@ -205,9 +205,9 @@ dns_c_ctrl_print(FILE *fp, int indent, dns_c_ctrl_t *ctl)
isc_result_t
dns_c_ctrl_list_new(isc_mem_t *mem, dns_c_ctrl_list_t **newlist)
dns_c_ctrllist_new(isc_mem_t *mem, dns_c_ctrllist_t **newlist)
{
dns_c_ctrl_list_t *newl;
dns_c_ctrllist_t *newl;
REQUIRE(mem != NULL);
REQUIRE (newlist != NULL);
......@@ -228,7 +228,7 @@ dns_c_ctrl_list_new(isc_mem_t *mem, dns_c_ctrl_list_t **newlist)
void
dns_c_ctrl_list_print(FILE *fp, int indent, dns_c_ctrl_list_t *cl)
dns_c_ctrllist_print(FILE *fp, int indent, dns_c_ctrllist_t *cl)
{
dns_c_ctrl_t *ctl;
......
This diff is collapsed.
......@@ -29,9 +29,9 @@
isc_result_t
dns_c_ipmatch_element_new(isc_mem_t *mem, dns_c_ipmatch_element_t **result)
dns_c_ipmatchelement_new(isc_mem_t *mem, dns_c_ipmatchelement_t **result)
{
dns_c_ipmatch_element_t *ime ;
dns_c_ipmatchelement_t *ime ;
REQUIRE(result != NULL);
......@@ -55,16 +55,16 @@ dns_c_ipmatch_element_new(isc_mem_t *mem, dns_c_ipmatch_element_t **result)
isc_boolean_t
dns_c_ipmatch_element_isneg(dns_c_ipmatch_element_t *elem)
dns_c_ipmatchelement_isneg(dns_c_ipmatchelement_t *elem)
{
return ((elem->flags & DNS_C_IPMATCH_NEGATE) == DNS_C_IPMATCH_NEGATE);
}
isc_result_t
dns_c_ipmatch_element_delete(isc_mem_t *mem, dns_c_ipmatch_element_t **ipme)
dns_c_ipmatchelement_delete(isc_mem_t *mem, dns_c_ipmatchelement_t **ipme)
{
dns_c_ipmatch_element_t *elem;
dns_c_ipmatchelement_t *elem;
REQUIRE(mem != NULL);
REQUIRE(ipme != NULL);
......@@ -85,7 +85,7 @@ dns_c_ipmatch_element_delete(isc_mem_t *mem, dns_c_ipmatch_element_t **ipme)
case dns_c_ipmatch_indirect:
INSIST(elem->u.indirect.list != NULL);
dns_c_ipmatch_list_delete(&elem->u.indirect.list);
dns_c_ipmatchlist_delete(&elem->u.indirect.list);
if (elem->u.indirect.refname.base != NULL) {
isc_mem_put(mem, elem->u.indirect.refname.base,
elem->u.indirect.refname.length);
......@@ -114,18 +114,18 @@ dns_c_ipmatch_element_delete(isc_mem_t *mem, dns_c_ipmatch_element_t **ipme)
isc_result_t
dns_c_ipmatch_element_copy(isc_mem_t *mem,
dns_c_ipmatch_element_t **dest,
dns_c_ipmatch_element_t *src)
dns_c_ipmatchelement_copy(isc_mem_t *mem,
dns_c_ipmatchelement_t **dest,
dns_c_ipmatchelement_t *src)
{
isc_result_t result;
dns_c_ipmatch_element_t *newel;
dns_c_ipmatchelement_t *newel;
REQUIRE(mem != NULL);
REQUIRE(dest != NULL);
REQUIRE(src != NULL);
result = dns_c_ipmatch_element_new(mem, &newel);
result = dns_c_ipmatchelement_new(mem, &newel);
if (result != ISC_R_SUCCESS) {
return (result);
}
......@@ -140,7 +140,7 @@ dns_c_ipmatch_element_copy(isc_mem_t *mem,
break;
case dns_c_ipmatch_indirect:
result = dns_c_ipmatch_list_copy(mem,
result = dns_c_ipmatchlist_copy(mem,
&newel->u.indirect.list,
src->u.indirect.list);
break;
......@@ -171,9 +171,9 @@ dns_c_ipmatch_element_copy(isc_mem_t *mem,
isc_result_t
dns_c_ipmatch_localhost_new(isc_mem_t *mem, dns_c_ipmatch_element_t **result)
dns_c_ipmatchlocalhost_new(isc_mem_t *mem, dns_c_ipmatchelement_t **result)
{
dns_c_ipmatch_element_t *ime = NULL;
dns_c_ipmatchelement_t *ime = NULL;
isc_result_t res;
REQUIRE(mem != NULL);
......@@ -181,7 +181,7 @@ dns_c_ipmatch_localhost_new(isc_mem_t *mem, dns_c_ipmatch_element_t **result)
*result = NULL;
res = dns_c_ipmatch_element_new(mem, &ime);
res = dns_c_ipmatchelement_new(mem, &ime);
if (res == ISC_R_SUCCESS) {
ime->type = dns_c_ipmatch_localhost;
}
......@@ -193,10 +193,10 @@ dns_c_ipmatch_localhost_new(isc_mem_t *mem, dns_c_ipmatch_element_t **result)
isc_result_t
dns_c_ipmatch_localnets_new(isc_mem_t *mem,
dns_c_ipmatch_element_t **result)
dns_c_ipmatchlocalnets_new(isc_mem_t *mem,
dns_c_ipmatchelement_t **result)
{
dns_c_ipmatch_element_t *ime = NULL;
dns_c_ipmatchelement_t *ime = NULL;
isc_result_t res;
REQUIRE(mem != NULL);
......@@ -204,7 +204,7 @@ dns_c_ipmatch_localnets_new(isc_mem_t *mem,
*result = NULL;
res = dns_c_ipmatch_element_new(mem, &ime);
res = dns_c_ipmatchelement_new(mem, &ime);
if (res == ISC_R_SUCCESS) {
ime->type = dns_c_ipmatch_localnets;
}
......@@ -216,13 +216,13 @@ dns_c_ipmatch_localnets_new(isc_mem_t *mem,
isc_result_t
dns_c_ipmatch_indirect_new(isc_mem_t *mem,
dns_c_ipmatch_element_t **result,
dns_c_ipmatch_list_t *iml,
dns_c_ipmatchindirect_new(isc_mem_t *mem,
dns_c_ipmatchelement_t **result,
dns_c_ipmatchlist_t *iml,
const char *name)
{
dns_c_ipmatch_element_t *ime;
dns_c_ipmatch_list_t *iml_copy;
dns_c_ipmatchelement_t *ime;
dns_c_ipmatchlist_t *iml_copy;
isc_result_t res;
REQUIRE(mem != NULL);
......@@ -231,12 +231,12 @@ dns_c_ipmatch_indirect_new(isc_mem_t *mem,
*result = NULL;
res = dns_c_ipmatch_list_copy(mem, &iml_copy, iml);
res = dns_c_ipmatchlist_copy(mem, &iml_copy, iml);
if (res != ISC_R_SUCCESS) {
return (res);
}
res = dns_c_ipmatch_element_new(mem, &ime);
res = dns_c_ipmatchelement_new(mem, &ime);
if (res == ISC_R_SUCCESS) {
ime->type = dns_c_ipmatch_indirect;
ime->u.indirect.list = iml_copy;
......@@ -249,7 +249,7 @@ dns_c_ipmatch_indirect_new(isc_mem_t *mem,
strcpy(ime->u.indirect.refname.base, name);
}
} else {
dns_c_ipmatch_list_delete(&iml_copy);
dns_c_ipmatchlist_delete(&iml_copy);
}
*result = ime;
......@@ -259,12 +259,12 @@ dns_c_ipmatch_indirect_new(isc_mem_t *mem,
isc_result_t
dns_c_ipmatch_pattern_new(isc_mem_t *mem,
dns_c_ipmatch_element_t **result,
dns_c_ipmatchpattern_new(isc_mem_t *mem,
dns_c_ipmatchelement_t **result,
dns_c_addr_t address,
isc_uint32_t maskbits)
{
dns_c_ipmatch_element_t *ime ;
dns_c_ipmatchelement_t *ime ;
isc_result_t res;
isc_uint32_t mask;
......@@ -274,7 +274,7 @@ dns_c_ipmatch_pattern_new(isc_mem_t *mem,
*result = NULL;
res = dns_c_ipmatch_element_new(mem, &ime);
res = dns_c_ipmatchelement_new(mem, &ime);
if (res != ISC_R_SUCCESS) {
return (res);
}
......@@ -297,7 +297,7 @@ dns_c_ipmatch_pattern_new(isc_mem_t *mem,
mask = ntohl(mask);
/* Make sure mask is on a net and not a host. */
if ((mask & address.u.a.s_addr) != address.u.a.s_addr) {
dns_c_ipmatch_element_delete(mem, &ime);
dns_c_ipmatchelement_delete(mem, &ime);
return (ISC_R_FAILURE);
}
}
......@@ -312,11 +312,11 @@ dns_c_ipmatch_pattern_new(isc_mem_t *mem,
isc_result_t
dns_c_ipmatch_key_new(isc_mem_t *mem,
dns_c_ipmatch_element_t **result,
dns_c_ipmatchkey_new(isc_mem_t *mem,
dns_c_ipmatchelement_t **result,
const char *key)
{
dns_c_ipmatch_element_t *ipme;
dns_c_ipmatchelement_t *ipme;
isc_result_t res;
REQUIRE(result != NULL);
......@@ -325,7 +325,7 @@ dns_c_ipmatch_key_new(isc_mem_t *mem,
*result = NULL;
res = dns_c_ipmatch_element_new(mem, &ipme);
res = dns_c_ipmatchelement_new(mem, &ipme);
if (res != ISC_R_SUCCESS) {
return (res);
}
......@@ -340,11 +340,11 @@ dns_c_ipmatch_key_new(isc_mem_t *mem,
isc_result_t
dns_c_ipmatch_acl_new(isc_mem_t *mem,
dns_c_ipmatch_element_t **result,
dns_c_ipmatch_aclnew(isc_mem_t *mem,
dns_c_ipmatchelement_t **result,
const char *aclname)
{
dns_c_ipmatch_element_t *ipme;
dns_c_ipmatchelement_t *ipme;
isc_result_t res;
REQUIRE(result != NULL);
......@@ -354,7 +354,7 @@ dns_c_ipmatch_acl_new(isc_mem_t *mem,
*result = NULL;
res = dns_c_ipmatch_element_new(mem, &ipme);
res = dns_c_ipmatchelement_new(mem, &ipme);
if (res != ISC_R_SUCCESS) {
return (res);
}
......@@ -369,7 +369,7 @@ dns_c_ipmatch_acl_new(isc_mem_t *mem,
isc_result_t
dns_c_ipmatch_negate(dns_c_ipmatch_element_t *ipe)
dns_c_ipmatch_negate(dns_c_ipmatchelement_t *ipe)
{
REQUIRE(ipe != NULL);
......@@ -384,9 +384,9 @@ dns_c_ipmatch_negate(dns_c_ipmatch_element_t *ipe)
isc_result_t
dns_c_ipmatch_list_new(isc_mem_t *mem, dns_c_ipmatch_list_t **ptr)
dns_c_ipmatchlist_new(isc_mem_t *mem, dns_c_ipmatchlist_t **ptr)
{
dns_c_ipmatch_list_t *newlist;
dns_c_ipmatchlist_t *newlist;
REQUIRE(ptr != NULL);
REQUIRE(mem != NULL);
......@@ -407,11 +407,11 @@ dns_c_ipmatch_list_new(isc_mem_t *mem, dns_c_ipmatch_list_t **ptr)
isc_result_t
dns_c_ipmatch_list_delete(dns_c_ipmatch_list_t **ml)
dns_c_ipmatchlist_delete(dns_c_ipmatchlist_t **ml)
{
dns_c_ipmatch_element_t *ime;
dns_c_ipmatch_element_t *iptr;
dns_c_ipmatch_list_t *iml;
dns_c_ipmatchelement_t *ime;
dns_c_ipmatchelement_t *iptr;
dns_c_ipmatchlist_t *iml;
isc_mem_t *mem;