diff options
| author | Internet Software Consortium, Inc <@isc.org> | 2007-09-07 14:08:19 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2007-09-07 14:08:19 -0600 |
| commit | 93744e253a50cdd78097dc5a150f4c035e8cbcc9 (patch) | |
| tree | f7470097a04345f967281dd4d658dd065c51d166 /bin/tests/name_test.c | |
| parent | 6257efc35455318993208bef65a551ac6039f51f (diff) | |
| download | bind9-93744e253a50cdd78097dc5a150f4c035e8cbcc9.tar.gz | |
9.0.0b3
Diffstat (limited to 'bin/tests/name_test.c')
| -rw-r--r-- | bin/tests/name_test.c | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/bin/tests/name_test.c b/bin/tests/name_test.c index 3305ed93..56286955 100644 --- a/bin/tests/name_test.c +++ b/bin/tests/name_test.c @@ -17,20 +17,14 @@ #include <config.h> -#include <ctype.h> -#include <stdio.h> #include <stdlib.h> -#include <string.h> -#include <isc/assertions.h> #include <isc/commandline.h> -#include <isc/boolean.h> -#include <isc/region.h> +#include <isc/string.h> +#include <isc/util.h> -#include <dns/types.h> -#include <dns/result.h> -#include <dns/name.h> #include <dns/fixedname.h> +#include <dns/result.h> static void print_wirename(isc_region_t *name) { @@ -54,13 +48,13 @@ print_name(dns_name_t *name) { isc_region_t r; char s[1000]; - isc_buffer_init(&source, s, sizeof s, ISC_BUFFERTYPE_TEXT); + isc_buffer_init(&source, s, sizeof(s)); if (dns_name_countlabels(name) > 0) result = dns_name_totext(name, ISC_FALSE, &source); else - result = DNS_R_SUCCESS; - if (result == DNS_R_SUCCESS) { - isc_buffer_used(&source, &r); + result = ISC_R_SUCCESS; + if (result == ISC_R_SUCCESS) { + isc_buffer_usedregion(&source, &r); if (r.length > 0) printf("%.*s\n", (int)r.length, r.base); else @@ -127,8 +121,7 @@ main(int argc, char *argv[]) { origin = NULL; else { len = strlen(argv[0]); - isc_buffer_init(&source, argv[0], len, - ISC_BUFFERTYPE_TEXT); + isc_buffer_init(&source, argv[0], len); isc_buffer_add(&source, len); dns_fixedname_init(&oname); origin = &oname.name; @@ -152,8 +145,7 @@ main(int argc, char *argv[]) { comp = NULL; else { len = strlen(argv[0]); - isc_buffer_init(&source, argv[0], len, - ISC_BUFFERTYPE_TEXT); + isc_buffer_init(&source, argv[0], len); isc_buffer_add(&source, len); dns_fixedname_init(&compname); comp = &compname.name; @@ -178,7 +170,7 @@ main(int argc, char *argv[]) { s[len - 1] = '\0'; len--; } - isc_buffer_init(&source, s, len, ISC_BUFFERTYPE_TEXT); + isc_buffer_init(&source, s, len); isc_buffer_add(&source, len); if (len > 0) @@ -189,10 +181,10 @@ main(int argc, char *argv[]) { dns_fixedname_init(&wname); else dns_fixedname_init(&wname2); - result = DNS_R_SUCCESS; + result = ISC_R_SUCCESS; } - if (result != DNS_R_SUCCESS) { + if (result != ISC_R_SUCCESS) { printf("%s\n", dns_result_totext(result)); if (name == dns_fixedname_name(&wname)) dns_fixedname_init(&wname); @@ -228,7 +220,7 @@ main(int argc, char *argv[]) { &wname2.name, NULL); name = &wname2.name; - if (result == DNS_R_SUCCESS) { + if (result == ISC_R_SUCCESS) { if (check_absolute && dns_name_countlabels(name) > 0) { if (dns_name_isabsolute(name)) @@ -259,13 +251,13 @@ main(int argc, char *argv[]) { } else got_name = ISC_TRUE; } - isc_buffer_init(&source, s, sizeof s, ISC_BUFFERTYPE_TEXT); + isc_buffer_init(&source, s, sizeof(s)); if (dns_name_countlabels(name) > 0) result = dns_name_totext(name, ISC_FALSE, &source); else - result = DNS_R_SUCCESS; - if (result == DNS_R_SUCCESS) { - isc_buffer_used(&source, &r); + result = ISC_R_SUCCESS; + if (result == ISC_R_SUCCESS) { + isc_buffer_usedregion(&source, &r); if (r.length > 0) printf("%.*s\n", (int)r.length, r.base); else @@ -292,8 +284,7 @@ main(int argc, char *argv[]) { dns_name_countlabels(down), r.length); } - isc_buffer_init(&source, s, sizeof s, - ISC_BUFFERTYPE_TEXT); + isc_buffer_init(&source, s, sizeof(s)); print_name(down); } |