From 47700eeee30ae05eedd43ddfe90279f3338c00db Mon Sep 17 00:00:00 2001 From: Brian Wellington Date: Thu, 18 Jan 2001 02:36:57 +0000 Subject: [PATCH] make zone_test compile --- bin/tests/zone_test.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c index 30cba9366d..cb8a5f66d7 100644 --- a/bin/tests/zone_test.c +++ b/bin/tests/zone_test.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone_test.c,v 1.23 2001/01/09 21:41:49 bwelling Exp $ */ +/* $Id: zone_test.c,v 1.24 2001/01/18 02:36:57 bwelling Exp $ */ #include @@ -74,13 +74,14 @@ usage() { } static void -setup(char *zonename, char *filename, char *classname) { +setup(const char *zonename, const char *filename, const char *classname) { isc_result_t result; dns_rdataclass_t rdclass; - isc_textregion_t region; + isc_consttextregion_t region; isc_buffer_t buffer; dns_fixedname_t fixorigin; dns_name_t *origin; + const char *rbt = "rbt"; if (debug) fprintf(stderr, "loading \"%s\" from \"%s\" class \"%s\"\n", @@ -101,15 +102,16 @@ setup(char *zonename, char *filename, char *classname) { result = dns_zone_setorigin(zone, origin); ERRRET(result, "dns_zone_setorigin"); - result = dns_zone_setdbtype(zone, "rbt"); + result = dns_zone_setdbtype(zone, 1, &rbt); ERRRET(result, "dns_zone_setdatabase"); - result = dns_zone_setdatabase(zone, filename); - ERRRET(result, "dns_zone_setdatabase"); + result = dns_zone_setfile(zone, filename); + ERRRET(result, "dns_zone_setfile"); region.base = classname; region.length = strlen(classname); - result = dns_rdataclass_fromtext(&rdclass, ®ion); + result = dns_rdataclass_fromtext(&rdclass, + (isc_textregion_t *)®ion); ERRRET(result, "dns_rdataclass_fromtext"); dns_zone_setclass(zone, rdclass); @@ -239,7 +241,7 @@ int main(int argc, char **argv) { int c; char *filename = NULL; - char *classname = "IN"; + const char *classname = "IN"; while ((c = isc_commandline_parse(argc, argv, "cdf:m:qsMS")) != EOF) { switch (c) {