diff --git a/bin/delv/delv.c b/bin/delv/delv.c index af9fa4b77e..b2dfe2a810 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -521,17 +521,17 @@ setup_style(dns_master_style_t **stylep) { } if (multiline || (nottl && noclass)) - result = dns_master_stylecreate2(&style, styleflags, - 24, 24, 24, 32, 80, 8, - splitwidth, mctx); + result = dns_master_stylecreate(&style, styleflags, + 24, 24, 24, 32, 80, 8, + splitwidth, mctx); else if (nottl || noclass) - result = dns_master_stylecreate2(&style, styleflags, - 24, 24, 32, 40, 80, 8, - splitwidth, mctx); + result = dns_master_stylecreate(&style, styleflags, + 24, 24, 32, 40, 80, 8, + splitwidth, mctx); else - result = dns_master_stylecreate2(&style, styleflags, - 24, 32, 40, 48, 80, 8, - splitwidth, mctx); + result = dns_master_stylecreate(&style, styleflags, + 24, 32, 40, 48, 80, 8, + splitwidth, mctx); if (result == ISC_R_SUCCESS) *stylep = style; diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 482809ccf0..71a00939ac 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -480,17 +480,17 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { } if (query->lookup->multiline || (query->lookup->nottl && query->lookup->noclass)) - result = dns_master_stylecreate2(&style, styleflags, - 24, 24, 24, 32, 80, 8, - splitwidth, mctx); + result = dns_master_stylecreate(&style, styleflags, + 24, 24, 24, 32, 80, 8, + splitwidth, mctx); else if (query->lookup->nottl || query->lookup->noclass) - result = dns_master_stylecreate2(&style, styleflags, - 24, 24, 32, 40, 80, 8, - splitwidth, mctx); + result = dns_master_stylecreate(&style, styleflags, + 24, 24, 32, 40, 80, 8, + splitwidth, mctx); else - result = dns_master_stylecreate2(&style, styleflags, - 24, 32, 40, 48, 80, 8, - splitwidth, mctx); + result = dns_master_stylecreate(&style, styleflags, + 24, 32, 40, 48, 80, 8, + splitwidth, mctx); check_result(result, "dns_master_stylecreate"); if (query->lookup->cmdline[0] != 0) { diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c index 6249a1b178..b9e44be02c 100644 --- a/bin/dnssec/dnssec-cds.c +++ b/bin/dnssec/dnssec-cds.c @@ -379,9 +379,9 @@ formatset(dns_rdataset_t *rdataset) { * which just separates fields with spaces. The huge tab stop width * eliminates any tab characters. */ - result = dns_master_stylecreate2(&style, styleflags, - 0, 0, 0, 0, 0, 1000000, 0, - mctx); + result = dns_master_stylecreate(&style, styleflags, + 0, 0, 0, 0, 0, 1000000, 0, + mctx); check_result(result, "dns_master_stylecreate2 failed"); result = isc_buffer_allocate(mctx, &buf, MAX_CDS_RDATA_TEXT_SIZE); diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 1f15017516..ee0be4f9f2 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -2985,7 +2985,8 @@ writeset(const char *prefix, dns_rdatatype_t type) { check_result(result, "dns_diff_apply"); dns_diff_clear(&diff); - result = dns_master_dump(mctx, db, dbversion, style, filename); + result = dns_master_dump(mctx, db, dbversion, style, filename, + dns_masterformat_text, NULL); check_result(result, "dns_master_dump"); isc_mem_put(mctx, filename, filenamelen); @@ -3633,8 +3634,8 @@ main(int argc, char *argv[]) { if (output_dnssec_only && set_maxttl) fatal("option -D cannot be used with -M"); - result = dns_master_stylecreate(&dsstyle, DNS_STYLEFLAG_NO_TTL, - 0, 24, 0, 0, 0, 8, mctx); + result = dns_master_stylecreate(&dsstyle, DNS_STYLEFLAG_NO_TTL, + 0, 24, 0, 0, 0, 8, 0xffffffff, mctx); check_result(result, "dns_master_stylecreate"); gdb = NULL; @@ -3878,9 +3879,9 @@ main(int argc, char *argv[]) { header.flags = DNS_MASTERRAW_SOURCESERIALSET; header.sourceserial = serialnum; } - result = dns_master_dumptostream3(mctx, gdb, gversion, - masterstyle, outputformat, - &header, outfp); + result = dns_master_dumptostream(mctx, gdb, gversion, + masterstyle, outputformat, + &header, outfp); check_result(result, "dns_master_dumptostream3"); } diff --git a/bin/tests/optional/master_test.c b/bin/tests/optional/master_test.c index 8d021842ae..ede633ae54 100644 --- a/bin/tests/optional/master_test.c +++ b/bin/tests/optional/master_test.c @@ -79,8 +79,9 @@ main(int argc, char *argv[]) { callbacks.add = print_dataset; result = dns_master_loadfile(argv[1], &origin, &origin, - dns_rdataclass_in, 0, - &callbacks, mctx); + dns_rdataclass_in, 0, 0, + &callbacks, NULL, NULL, mctx, + dns_masterformat_text, 0); fprintf(stdout, "dns_master_loadfile: %s\n", dns_result_totext(result)); } diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index cc21f74089..492d0a844e 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -268,17 +268,17 @@ recvresponse(isc_task_t *task, isc_event_t *event) { styleflags |= DNS_STYLEFLAG_RRCOMMENT; } if (display_multiline || (!display_ttl && !display_class)) - result = dns_master_stylecreate2(&style, styleflags, - 24, 24, 24, 32, 80, 8, - display_splitwidth, mctx); + result = dns_master_stylecreate(&style, styleflags, + 24, 24, 24, 32, 80, 8, + display_splitwidth, mctx); else if (!display_ttl || !display_class) - result = dns_master_stylecreate2(&style, styleflags, - 24, 24, 32, 40, 80, 8, - display_splitwidth, mctx); + result = dns_master_stylecreate(&style, styleflags, + 24, 24, 32, 40, 80, 8, + display_splitwidth, mctx); else - result = dns_master_stylecreate2(&style, styleflags, - 24, 32, 40, 48, 80, 8, - display_splitwidth, mctx); + result = dns_master_stylecreate(&style, styleflags, + 24, 32, 40, 48, 80, 8, + display_splitwidth, mctx); CHECK("dns_master_stylecreate2", result); flags = 0; diff --git a/lib/dns/cache.c b/lib/dns/cache.c index 952fd997d4..fc640ae616 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -518,7 +518,8 @@ dns_cache_dump(dns_cache_t *cache) { LOCK(&cache->filelock); result = dns_master_dump(cache->mctx, cache->db, NULL, - &dns_master_style_cache, cache->filename); + &dns_master_style_cache, cache->filename, + dns_masterformat_text, NULL); UNLOCK(&cache->filelock); return (result); diff --git a/lib/dns/db.c b/lib/dns/db.c index 6a2ca110ab..ce9c424f89 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -329,9 +329,9 @@ dns_db_load(dns_db_t *db, const char *filename, dns_masterformat_t format, result = dns_db_beginload(db, &callbacks); if (result != ISC_R_SUCCESS) return (result); - result = dns_master_loadfile2(filename, &db->origin, &db->origin, - db->rdclass, options, - &callbacks, db->mctx, format); + result = dns_master_loadfile(filename, &db->origin, &db->origin, + db->rdclass, options, 0, &callbacks, + NULL, NULL, db->mctx, format, 0); eresult = dns_db_endload(db, &callbacks); /* * We always call dns_db_endload(), but we only want to return its diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h index a0075fddcd..2c257e7983 100644 --- a/lib/dns/include/dns/master.h +++ b/lib/dns/include/dns/master.h @@ -118,54 +118,12 @@ dns_master_loadfile(const char *master_file, dns_name_t *origin, dns_rdataclass_t zclass, unsigned int options, + isc_uint32_t resign, dns_rdatacallbacks_t *callbacks, - isc_mem_t *mctx); - -isc_result_t -dns_master_loadfile2(const char *master_file, - dns_name_t *top, - dns_name_t *origin, - dns_rdataclass_t zclass, - unsigned int options, - dns_rdatacallbacks_t *callbacks, - isc_mem_t *mctx, - dns_masterformat_t format); - -isc_result_t -dns_master_loadfile3(const char *master_file, - dns_name_t *top, - dns_name_t *origin, - dns_rdataclass_t zclass, - unsigned int options, - isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, - isc_mem_t *mctx, - dns_masterformat_t format); - -isc_result_t -dns_master_loadfile4(const char *master_file, - dns_name_t *top, - dns_name_t *origin, - dns_rdataclass_t zclass, - unsigned int options, - isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, - dns_masterincludecb_t include_cb, - void *include_arg, isc_mem_t *mctx, - dns_masterformat_t format); - -isc_result_t -dns_master_loadfile5(const char *master_file, - dns_name_t *top, - dns_name_t *origin, - dns_rdataclass_t zclass, - unsigned int options, - isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, - dns_masterincludecb_t include_cb, - void *include_arg, isc_mem_t *mctx, - dns_masterformat_t format, - dns_ttl_t maxttl); + dns_masterincludecb_t include_cb, + void *include_arg, isc_mem_t *mctx, + dns_masterformat_t format, + dns_ttl_t maxttl); isc_result_t dns_master_loadstream(FILE *stream, @@ -200,64 +158,14 @@ dns_master_loadfileinc(const char *master_file, dns_name_t *origin, dns_rdataclass_t zclass, unsigned int options, + isc_uint32_t resign, dns_rdatacallbacks_t *callbacks, isc_task_t *task, dns_loaddonefunc_t done, void *done_arg, - dns_loadctx_t **ctxp, isc_mem_t *mctx); - -isc_result_t -dns_master_loadfileinc2(const char *master_file, - dns_name_t *top, - dns_name_t *origin, - dns_rdataclass_t zclass, - unsigned int options, - dns_rdatacallbacks_t *callbacks, - isc_task_t *task, - dns_loaddonefunc_t done, void *done_arg, - dns_loadctx_t **ctxp, isc_mem_t *mctx, - dns_masterformat_t format); - -isc_result_t -dns_master_loadfileinc3(const char *master_file, - dns_name_t *top, - dns_name_t *origin, - dns_rdataclass_t zclass, - unsigned int options, - isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, - isc_task_t *task, - dns_loaddonefunc_t done, void *done_arg, - dns_loadctx_t **ctxp, isc_mem_t *mctx, - dns_masterformat_t format); - -isc_result_t -dns_master_loadfileinc4(const char *master_file, - dns_name_t *top, - dns_name_t *origin, - dns_rdataclass_t zclass, - unsigned int options, - isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, - isc_task_t *task, - dns_loaddonefunc_t done, void *done_arg, - dns_loadctx_t **ctxp, - dns_masterincludecb_t include_cb, void *include_arg, - isc_mem_t *mctx, dns_masterformat_t format); - -isc_result_t -dns_master_loadfileinc5(const char *master_file, - dns_name_t *top, - dns_name_t *origin, - dns_rdataclass_t zclass, - unsigned int options, - isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, - isc_task_t *task, - dns_loaddonefunc_t done, void *done_arg, - dns_loadctx_t **ctxp, - dns_masterincludecb_t include_cb, void *include_arg, - isc_mem_t *mctx, dns_masterformat_t format, - isc_uint32_t maxttl); + dns_loadctx_t **ctxp, + dns_masterincludecb_t include_cb, void *include_arg, + isc_mem_t *mctx, dns_masterformat_t format, + isc_uint32_t maxttl); isc_result_t dns_master_loadstreaminc(FILE *stream, diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h index 6a3fe6ca21..f3acd11399 100644 --- a/lib/dns/include/dns/masterdump.h +++ b/lib/dns/include/dns/masterdump.h @@ -267,20 +267,9 @@ dns_master_dumptostreaminc(isc_mem_t *mctx, dns_db_t *db, isc_result_t dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - const dns_master_style_t *style, FILE *f); - -isc_result_t -dns_master_dumptostream2(isc_mem_t *mctx, dns_db_t *db, - dns_dbversion_t *version, - const dns_master_style_t *style, - dns_masterformat_t format, FILE *f); - -isc_result_t -dns_master_dumptostream3(isc_mem_t *mctx, dns_db_t *db, - dns_dbversion_t *version, - const dns_master_style_t *style, - dns_masterformat_t format, - dns_masterrawheader_t *header, FILE *f); + const dns_master_style_t *style, + dns_masterformat_t format, + dns_masterrawheader_t *header, FILE *f); /*%< * Dump the database 'db' to the steam 'f' in the specified format by * 'format'. If the format is dns_masterformat_text (the RFC1035 format), @@ -311,40 +300,19 @@ dns_master_dumptostream3(isc_mem_t *mctx, dns_db_t *db, /*@}*/ /*@{*/ + isc_result_t dns_master_dumpinc(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, const dns_master_style_t *style, const char *filename, - isc_task_t *task, dns_dumpdonefunc_t done, void *done_arg, - dns_dumpctx_t **dctxp); - -isc_result_t -dns_master_dumpinc2(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - const dns_master_style_t *style, const char *filename, - isc_task_t *task, dns_dumpdonefunc_t done, void *done_arg, dns_dumpctx_t **dctxp, dns_masterformat_t format); - -isc_result_t -dns_master_dumpinc3(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - const dns_master_style_t *style, const char *filename, - isc_task_t *task, dns_dumpdonefunc_t done, void - *done_arg, dns_dumpctx_t **dctxp, - dns_masterformat_t format, dns_masterrawheader_t *header); + isc_task_t *task, dns_dumpdonefunc_t done, void + *done_arg, dns_dumpctx_t **dctxp, + dns_masterformat_t format, dns_masterrawheader_t *header); isc_result_t dns_master_dump(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - const dns_master_style_t *style, const char *filename); - -isc_result_t -dns_master_dump2(isc_mem_t *mctx, dns_db_t *db, - dns_dbversion_t *version, - const dns_master_style_t *style, const char *filename, - dns_masterformat_t format); - -isc_result_t -dns_master_dump3(isc_mem_t *mctx, dns_db_t *db, - dns_dbversion_t *version, - const dns_master_style_t *style, const char *filename, - dns_masterformat_t format, dns_masterrawheader_t *header); + const dns_master_style_t *style, const char *filename, + dns_masterformat_t format, dns_masterrawheader_t *header); /*%< * Dump the database 'db' to the file 'filename' in the specified format by @@ -414,15 +382,7 @@ dns_master_stylecreate(dns_master_style_t **style, unsigned int ttl_column, unsigned int class_column, unsigned int type_column, unsigned int rdata_column, unsigned int line_length, unsigned int tab_width, - isc_mem_t *mctx); - -isc_result_t -dns_master_stylecreate2(dns_master_style_t **style, - dns_masterstyle_flags_t flags, - unsigned int ttl_column, unsigned int class_column, - unsigned int type_column, unsigned int rdata_column, - unsigned int line_length, unsigned int tab_width, - unsigned int split_width, isc_mem_t *mctx); + unsigned int split_width, isc_mem_t *mctx); void dns_master_styledestroy(dns_master_style_t **style, isc_mem_t *mctx); diff --git a/lib/dns/master.c b/lib/dns/master.c index e2a1f70b61..a49fa26c8e 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -2588,61 +2588,12 @@ load_raw(dns_loadctx_t *lctx) { isc_result_t dns_master_loadfile(const char *master_file, dns_name_t *top, - dns_name_t *origin, - dns_rdataclass_t zclass, unsigned int options, - dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx) -{ - return (dns_master_loadfile5(master_file, top, origin, zclass, - options, 0, callbacks, NULL, NULL, - mctx, dns_masterformat_text, 0)); -} - -isc_result_t -dns_master_loadfile2(const char *master_file, dns_name_t *top, - dns_name_t *origin, - dns_rdataclass_t zclass, unsigned int options, - dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx, - dns_masterformat_t format) -{ - return (dns_master_loadfile5(master_file, top, origin, zclass, - options, 0, callbacks, NULL, NULL, - mctx, format, 0)); -} - -isc_result_t -dns_master_loadfile3(const char *master_file, dns_name_t *top, - dns_name_t *origin, dns_rdataclass_t zclass, - unsigned int options, isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx, - dns_masterformat_t format) -{ - return (dns_master_loadfile5(master_file, top, origin, zclass, - options, resign, callbacks, NULL, NULL, - mctx, format, 0)); -} - -isc_result_t -dns_master_loadfile4(const char *master_file, dns_name_t *top, - dns_name_t *origin, dns_rdataclass_t zclass, - unsigned int options, isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, - dns_masterincludecb_t include_cb, void *include_arg, - isc_mem_t *mctx, dns_masterformat_t format) -{ - return (dns_master_loadfile5(master_file, top, origin, zclass, - options, resign, callbacks, - include_cb, include_arg, - mctx, format, 0)); -} - -isc_result_t -dns_master_loadfile5(const char *master_file, dns_name_t *top, - dns_name_t *origin, dns_rdataclass_t zclass, - unsigned int options, isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, - dns_masterincludecb_t include_cb, void *include_arg, - isc_mem_t *mctx, dns_masterformat_t format, - dns_ttl_t maxttl) + dns_name_t *origin, dns_rdataclass_t zclass, + unsigned int options, isc_uint32_t resign, + dns_rdatacallbacks_t *callbacks, + dns_masterincludecb_t include_cb, void *include_arg, + isc_mem_t *mctx, dns_masterformat_t format, + dns_ttl_t maxttl) { dns_loadctx_t *lctx = NULL; isc_result_t result; @@ -2670,72 +2621,13 @@ dns_master_loadfile5(const char *master_file, dns_name_t *top, isc_result_t dns_master_loadfileinc(const char *master_file, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, - unsigned int options, dns_rdatacallbacks_t *callbacks, + unsigned int options, isc_uint32_t resign, + dns_rdatacallbacks_t *callbacks, isc_task_t *task, dns_loaddonefunc_t done, - void *done_arg, dns_loadctx_t **lctxp, isc_mem_t *mctx) -{ - return (dns_master_loadfileinc4(master_file, top, origin, zclass, - options, 0, callbacks, task, done, - done_arg, lctxp, NULL, NULL, mctx, - dns_masterformat_text)); -} - -isc_result_t -dns_master_loadfileinc2(const char *master_file, dns_name_t *top, - dns_name_t *origin, dns_rdataclass_t zclass, - unsigned int options, dns_rdatacallbacks_t *callbacks, - isc_task_t *task, dns_loaddonefunc_t done, - void *done_arg, dns_loadctx_t **lctxp, isc_mem_t *mctx, - dns_masterformat_t format) -{ - return (dns_master_loadfileinc4(master_file, top, origin, zclass, - options, 0, callbacks, task, done, - done_arg, lctxp, NULL, NULL, mctx, - format)); -} - -isc_result_t -dns_master_loadfileinc3(const char *master_file, dns_name_t *top, - dns_name_t *origin, dns_rdataclass_t zclass, - unsigned int options, isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, isc_task_t *task, - dns_loaddonefunc_t done, void *done_arg, - dns_loadctx_t **lctxp, isc_mem_t *mctx, - dns_masterformat_t format) -{ - return (dns_master_loadfileinc4(master_file, top, origin, zclass, - options, resign, callbacks, task, - done, done_arg, lctxp, NULL, NULL, - mctx, format)); -} - -isc_result_t -dns_master_loadfileinc4(const char *master_file, dns_name_t *top, - dns_name_t *origin, dns_rdataclass_t zclass, - unsigned int options, isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, - isc_task_t *task, dns_loaddonefunc_t done, - void *done_arg, dns_loadctx_t **lctxp, - dns_masterincludecb_t include_cb, void *include_arg, - isc_mem_t *mctx, dns_masterformat_t format) -{ - options &= ~DNS_MASTER_CHECKTTL; - return (dns_master_loadfileinc5(master_file, top, origin, zclass, - options, resign, callbacks, task, - done, done_arg, lctxp, include_cb, - include_arg, mctx, format, 0)); -} - -isc_result_t -dns_master_loadfileinc5(const char *master_file, dns_name_t *top, - dns_name_t *origin, dns_rdataclass_t zclass, - unsigned int options, isc_uint32_t resign, - dns_rdatacallbacks_t *callbacks, - isc_task_t *task, dns_loaddonefunc_t done, - void *done_arg, dns_loadctx_t **lctxp, - dns_masterincludecb_t include_cb, void *include_arg, - isc_mem_t *mctx, dns_masterformat_t format, - isc_uint32_t maxttl) + void *done_arg, dns_loadctx_t **lctxp, + dns_masterincludecb_t include_cb, void *include_arg, + isc_mem_t *mctx, dns_masterformat_t format, + isc_uint32_t maxttl) { dns_loadctx_t *lctx = NULL; isc_result_t result; diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index 0c17907a3d..6fd0d29a40 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -1793,35 +1793,12 @@ dns_master_dumptostreaminc(isc_mem_t *mctx, dns_db_t *db, return (result); } -/* - * Dump an entire database into a master file. - */ isc_result_t dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, const dns_master_style_t *style, - FILE *f) -{ - return (dns_master_dumptostream3(mctx, db, version, style, - dns_masterformat_text, NULL, f)); -} - -isc_result_t -dns_master_dumptostream2(isc_mem_t *mctx, dns_db_t *db, - dns_dbversion_t *version, - const dns_master_style_t *style, - dns_masterformat_t format, FILE *f) -{ - return (dns_master_dumptostream3(mctx, db, version, style, - format, NULL, f)); -} - -isc_result_t -dns_master_dumptostream3(isc_mem_t *mctx, dns_db_t *db, - dns_dbversion_t *version, - const dns_master_style_t *style, - dns_masterformat_t format, - dns_masterrawheader_t *header, FILE *f) + dns_masterformat_t format, + dns_masterrawheader_t *header, FILE *f) { dns_dumpctx_t *dctx = NULL; isc_result_t result; @@ -1880,29 +1857,8 @@ isc_result_t dns_master_dumpinc(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, const dns_master_style_t *style, const char *filename, isc_task_t *task, dns_dumpdonefunc_t done, void *done_arg, - dns_dumpctx_t **dctxp) -{ - return (dns_master_dumpinc3(mctx, db, version, style, filename, task, - done, done_arg, dctxp, - dns_masterformat_text, NULL)); -} - -isc_result_t -dns_master_dumpinc2(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - const dns_master_style_t *style, const char *filename, - isc_task_t *task, dns_dumpdonefunc_t done, void *done_arg, - dns_dumpctx_t **dctxp, dns_masterformat_t format) -{ - return (dns_master_dumpinc3(mctx, db, version, style, filename, task, - done, done_arg, dctxp, format, NULL)); -} - -isc_result_t -dns_master_dumpinc3(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - const dns_master_style_t *style, const char *filename, - isc_task_t *task, dns_dumpdonefunc_t done, void *done_arg, - dns_dumpctx_t **dctxp, dns_masterformat_t format, - dns_masterrawheader_t *header) + dns_dumpctx_t **dctxp, dns_masterformat_t format, + dns_masterrawheader_t *header) { FILE *f = NULL; isc_result_t result; @@ -1953,25 +1909,8 @@ dns_master_dumpinc3(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, isc_result_t dns_master_dump(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - const dns_master_style_t *style, const char *filename) -{ - return (dns_master_dump3(mctx, db, version, style, filename, - dns_masterformat_text, NULL)); -} - -isc_result_t -dns_master_dump2(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - const dns_master_style_t *style, const char *filename, - dns_masterformat_t format) -{ - return (dns_master_dump3(mctx, db, version, style, filename, - format, NULL)); -} - -isc_result_t -dns_master_dump3(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - const dns_master_style_t *style, const char *filename, - dns_masterformat_t format, dns_masterrawheader_t *header) + const dns_master_style_t *style, const char *filename, + dns_masterformat_t format, dns_masterrawheader_t *header) { FILE *f = NULL; isc_result_t result; @@ -2098,21 +2037,7 @@ dns_master_stylecreate(dns_master_style_t **stylep, unsigned int ttl_column, unsigned int class_column, unsigned int type_column, unsigned int rdata_column, unsigned int line_length, unsigned int tab_width, - isc_mem_t *mctx) -{ - return (dns_master_stylecreate2(stylep, flags, ttl_column, - class_column, type_column, - rdata_column, line_length, - tab_width, 0xffffffff, mctx)); -} - -isc_result_t -dns_master_stylecreate2(dns_master_style_t **stylep, - dns_masterstyle_flags_t flags, - unsigned int ttl_column, unsigned int class_column, - unsigned int type_column, unsigned int rdata_column, - unsigned int line_length, unsigned int tab_width, - unsigned int split_width, isc_mem_t *mctx) + unsigned int split_width, isc_mem_t *mctx) { dns_master_style_t *style; diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 62ec8ca502..7aa5e43c1a 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -7931,9 +7931,9 @@ dump(dns_db_t *db, dns_dbversion_t *version, const char *filename, REQUIRE(VALID_RBTDB(rbtdb)); INSIST(rbtversion == NULL || rbtversion->rbtdb == rbtdb); - return (dns_master_dump2(rbtdb->common.mctx, db, version, - &dns_master_style_default, - filename, masterformat)); + return (dns_master_dump(rbtdb->common.mctx, db, version, + &dns_master_style_default, + filename, masterformat, NULL)); } static void diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c index 4427d050b5..15139938b2 100644 --- a/lib/dns/rootns.c +++ b/lib/dns/rootns.c @@ -224,8 +224,9 @@ dns_rootns_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, */ result = dns_master_loadfile(filename, &db->origin, &db->origin, db->rdclass, - DNS_MASTER_HINT, - &callbacks, db->mctx); + DNS_MASTER_HINT, 0, &callbacks, + NULL, NULL, db->mctx, + dns_masterformat_text, 0); } else if (rdclass == dns_rdataclass_in) { /* * Default to using the Internet root servers. diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c index fe94108661..f333c04996 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -1126,7 +1126,8 @@ modrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, if (result != ISC_R_SUCCESS) return (result); - result = dns_master_stylecreate(&style, 0, 0, 0, 0, 0, 0, 1, mctx); + result = dns_master_stylecreate(&style, 0, 0, 0, 0, 0, 0, 1, + 0xffffffff, mctx); if (result != ISC_R_SUCCESS) goto cleanup; diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c index 7e7865debc..9beda1aaf2 100644 --- a/lib/dns/tests/master_test.c +++ b/lib/dns/tests/master_test.c @@ -123,9 +123,9 @@ test_master(const char *testfile, dns_masterformat_t format, if (result != ISC_R_SUCCESS) return(result); - result = dns_master_loadfile2(testfile, &dns_origin, &dns_origin, - dns_rdataclass_in, ISC_TRUE, - &callbacks, mctx, format); + result = dns_master_loadfile(testfile, &dns_origin, &dns_origin, + dns_rdataclass_in, ISC_TRUE, 0, + &callbacks, NULL, NULL, mctx, format, 0); return (result); } @@ -378,11 +378,11 @@ ATF_TC_BODY(master_includelist, tc) { result = setup_master(NULL, NULL); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - result = dns_master_loadfile4("testdata/master/master8.data", - &dns_origin, &dns_origin, - dns_rdataclass_in, 0, ISC_TRUE, - &callbacks, include_callback, - &filename, mctx, dns_masterformat_text); + result = dns_master_loadfile("testdata/master/master8.data", + &dns_origin, &dns_origin, + dns_rdataclass_in, 0, ISC_TRUE, + &callbacks, include_callback, + &filename, mctx, dns_masterformat_text, 0); ATF_CHECK_EQ(result, DNS_R_SEENINCLUDE); ATF_CHECK(filename != NULL); if (filename != NULL) { @@ -580,9 +580,9 @@ ATF_TC_BODY(dumpraw, tc) { dns_db_currentversion(db, &version); - result = dns_master_dump2(mctx, db, version, - &dns_master_style_default, "test.dump", - dns_masterformat_raw); + result = dns_master_dump(mctx, db, version, + &dns_master_style_default, "test.dump", + dns_masterformat_raw, NULL); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); result = test_master("test.dump", dns_masterformat_raw, NULL, NULL); @@ -595,9 +595,9 @@ ATF_TC_BODY(dumpraw, tc) { header.flags |= DNS_MASTERRAW_SOURCESERIALSET; unlink("test.dump"); - result = dns_master_dump3(mctx, db, version, - &dns_master_style_default, "test.dump", - dns_masterformat_raw, &header); + result = dns_master_dump(mctx, db, version, + &dns_master_style_default, "test.dump", + dns_masterformat_raw, &header); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); result = test_master("test.dump", dns_masterformat_raw, NULL, NULL); diff --git a/lib/dns/view.c b/lib/dns/view.c index 96ea911fb8..7a569bb26a 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -1610,7 +1610,8 @@ dns_view_dumpdbtostream(dns_view_t *view, FILE *fp) { (void)fprintf(fp, ";\n; Cache dump of view '%s'\n;\n", view->name); result = dns_master_dumptostream(view->mctx, view->cachedb, NULL, - &dns_master_style_cache, fp); + &dns_master_style_cache, + dns_masterformat_text, NULL, fp); if (result != ISC_R_SUCCESS) return (result); dns_adb_dump(view->adb, fp); diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in index 7dc0e2b699..cb5c7c5202 100644 --- a/lib/dns/win32/libdns.def.in +++ b/lib/dns/win32/libdns.def.in @@ -458,30 +458,16 @@ dns_lookup_cancel dns_lookup_create dns_lookup_destroy dns_master_dump -dns_master_dump2 -dns_master_dump3 dns_master_dumpinc -dns_master_dumpinc2 -dns_master_dumpinc3 dns_master_dumpnode dns_master_dumpnodetostream dns_master_dumptostream -dns_master_dumptostream2 -dns_master_dumptostream3 dns_master_dumptostreaminc dns_master_initrawheader dns_master_loadbuffer dns_master_loadbufferinc dns_master_loadfile -dns_master_loadfile2 -dns_master_loadfile3 -dns_master_loadfile4 -dns_master_loadfile5 dns_master_loadfileinc -dns_master_loadfileinc2 -dns_master_loadfileinc3 -dns_master_loadfileinc4 -dns_master_loadfileinc5 dns_master_loadlexer dns_master_loadlexerinc dns_master_loadstream @@ -489,7 +475,6 @@ dns_master_loadstreaminc dns_master_questiontotext dns_master_rdatasettotext dns_master_stylecreate -dns_master_stylecreate2 dns_master_styledestroy dns_master_styleflags dns_message_addname diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 707d5c9fc7..6fe852f3c8 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -2353,17 +2353,17 @@ zone_gotreadhandle(isc_task_t *task, isc_event_t *event) { options = get_master_options(load->zone); - result = dns_master_loadfileinc5(load->zone->masterfile, - dns_db_origin(load->db), - dns_db_origin(load->db), - load->zone->rdclass, options, 0, - &load->callbacks, task, - zone_loaddone, load, - &load->zone->lctx, - zone_registerinclude, - load->zone, load->zone->mctx, - load->zone->masterformat, - load->zone->maxttl); + result = dns_master_loadfileinc(load->zone->masterfile, + dns_db_origin(load->db), + dns_db_origin(load->db), + load->zone->rdclass, options, 0, + &load->callbacks, task, + zone_loaddone, load, + &load->zone->lctx, + zone_registerinclude, + load->zone, load->zone->mctx, + load->zone->masterformat, + load->zone->maxttl); if (result != ISC_R_SUCCESS && result != DNS_R_CONTINUE && result != DNS_R_SEENINCLUDE) goto fail; @@ -2424,10 +2424,11 @@ zone_gotwritehandle(isc_task_t *task, isc_event_t *event) { output_style = zone->masterstyle; else output_style = &dns_master_style_default; - result = dns_master_dumpinc3(zone->mctx, zone->db, version, - output_style, zone->masterfile, - zone->task, dump_done, zone, &zone->dctx, zone->masterformat, - &rawdata); + result = dns_master_dumpinc(zone->mctx, zone->db, version, + output_style, zone->masterfile, + zone->task, dump_done, zone, + &zone->dctx, zone->masterformat, + &rawdata); dns_db_closeversion(zone->db, &version, ISC_FALSE); } else result = ISC_R_CANCELED; @@ -2522,14 +2523,14 @@ zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) { zone_idetach(&callbacks.zone); return (result); } - result = dns_master_loadfile5(zone->masterfile, - &zone->origin, &zone->origin, - zone->rdclass, options, 0, - &callbacks, - zone_registerinclude, - zone, zone->mctx, - zone->masterformat, - zone->maxttl); + result = dns_master_loadfile(zone->masterfile, + &zone->origin, &zone->origin, + zone->rdclass, options, 0, + &callbacks, + zone_registerinclude, + zone, zone->mctx, + zone->masterformat, + zone->maxttl); tresult = dns_db_endload(db, &callbacks); if (result == ISC_R_SUCCESS) result = tresult; @@ -10446,9 +10447,9 @@ zone_dump(dns_zone_t *zone, isc_boolean_t compact) { output_style = &dns_master_style_keyzone; else output_style = &dns_master_style_default; - result = dns_master_dump3(zone->mctx, db, version, - output_style, masterfile, - masterformat, &rawdata); + result = dns_master_dump(zone->mctx, db, version, + output_style, masterfile, + masterformat, &rawdata); dns_db_closeversion(db, &version, ISC_FALSE); } fail: @@ -10513,8 +10514,8 @@ dumptostream(dns_zone_t *zone, FILE *fd, const dns_master_style_t *style, rawdata.flags = DNS_MASTERRAW_SOURCESERIALSET; rawdata.sourceserial = zone->sourceserial; } - result = dns_master_dumptostream3(zone->mctx, db, version, style, - format, &rawdata, fd); + result = dns_master_dumptostream(zone->mctx, db, version, style, + format, &rawdata, fd); dns_db_closeversion(db, &version, ISC_FALSE); dns_db_detach(&db); return (result);