From f150692ba3f14220eb0d2cd375ae4124f1d41fba Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Sat, 6 Feb 1999 01:18:18 +0000 Subject: [PATCH] name change --- lib/dns/include/dns/master.h | 3 ++- lib/dns/master.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h index e4e2a1b043..be2f401e40 100644 --- a/lib/dns/include/dns/master.h +++ b/lib/dns/include/dns/master.h @@ -25,7 +25,7 @@ #include #include -dns_result_t dns_load_master(char *master_file, +dns_result_t dns_master_load(char *master_file, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t class, @@ -36,4 +36,5 @@ dns_result_t dns_load_master(char *master_file, void *private), void *private, isc_mem_t *mctx); + #endif /* DNS_MASTER_H */ diff --git a/lib/dns/master.c b/lib/dns/master.c index 060bcda0ce..b686f5bd39 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: master.c,v 1.8 1999/02/04 06:38:41 marka Exp $ */ + /* $Id: master.c,v 1.9 1999/02/06 01:18:17 halley Exp $ */ #include @@ -74,11 +74,11 @@ static dns_rdata_t *grow_rdata(int, dns_rdata_t *, int, dns_result_t -dns_load_master(char *master_file, dns_name_t *top, dns_name_t *origin, - dns_rdataclass_t zclass, int *soacount, int *nscount, - dns_result_t (*callback)(dns_name_t *, dns_rdataset_t *, - void *private), - void *private, isc_mem_t *mctx) +dns_master_load(char *master_file, dns_name_t *top, dns_name_t *origin, + dns_rdataclass_t zclass, int *soacount, int *nscount, + dns_result_t (*callback)(dns_name_t *, dns_rdataset_t *, + void *private), + void *private, isc_mem_t *mctx) { dns_rdataclass_t class; dns_rdatatype_t type; @@ -211,7 +211,7 @@ dns_load_master(char *master_file, dns_name_t *top, dns_name_t *origin, GETTOKEN(lex, 0, &token, ISC_TRUE); if (token.type == isc_tokentype_eol || token.type == isc_tokentype_eof) { - result = dns_load_master(include_file, + result = dns_master_load(include_file, top, &origin_name, zclass, @@ -257,7 +257,7 @@ dns_load_master(char *master_file, dns_name_t *top, dns_name_t *origin, continue; } if (finish_include) { - result = dns_load_master(include_file, + result = dns_master_load(include_file, top, &new_name, zclass,