From: Michał Kępień Date: Wed, 28 Mar 2018 12:38:09 +0000 (+0200) Subject: Use dns_fixedname_initname() where possible X-Git-Tag: v9.13.0~69^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4df4a8e73149dd4df1b9aad44db3c33e1c4f1880;p=thirdparty%2Fbind9.git Use dns_fixedname_initname() where possible Replace dns_fixedname_init() calls followed by dns_fixedname_name() calls with calls to dns_fixedname_initname() where it is possible without affecting current behavior and/or performance. This patch was mostly prepared using Coccinelle and the following semantic patch: @@ expression fixedname, name; @@ - dns_fixedname_init(&fixedname); ... - name = dns_fixedname_name(&fixedname); + name = dns_fixedname_initname(&fixedname); The resulting set of changes was then manually reviewed to exclude false positives and apply minor tweaks. It is likely that more occurrences of this pattern can be refactored in an identical way. This commit only takes care of the low-hanging fruit. --- diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index e8734e1b1e4..0a57a37957f 100644 --- a/bin/check/check-tool.c +++ b/bin/check/check-tool.c @@ -589,8 +589,7 @@ check_ttls(dns_zone_t *zone, dns_ttl_t maxttl) { dns_rdataset_t rdataset; dns_fixedname_t fname; dns_name_t *name; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); dns_rdataset_init(&rdataset); CHECK(dns_zone_getdb(zone, &db)); @@ -685,8 +684,7 @@ load_zone(isc_mem_t *mctx, const char *zonename, const char *filename, isc_buffer_constinit(&buffer, zonename, strlen(zonename)); isc_buffer_add(&buffer, strlen(zonename)); - dns_fixedname_init(&fixorigin); - origin = dns_fixedname_name(&fixorigin); + origin = dns_fixedname_initname(&fixorigin); CHECK(dns_name_fromtext(origin, &buffer, dns_rootname, 0, NULL)); CHECK(dns_zone_setorigin(zone, origin)); CHECK(dns_zone_setdbtype(zone, 1, (const char * const *) dbtype)); diff --git a/bin/delv/delv.c b/bin/delv/delv.c index b2dfe2a8102..bf1fa104e22 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -550,8 +550,7 @@ convert_name(dns_fixedname_t *fn, dns_name_t **name, const char *text) { isc_buffer_constinit(&b, text, len); isc_buffer_add(&b, len); - dns_fixedname_init(fn); - n = dns_fixedname_name(fn); + n = dns_fixedname_initname(fn); result = dns_name_fromtext(n, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { @@ -1538,8 +1537,7 @@ get_reverse(char *reverse, size_t len, char *value, isc_boolean_t strict) { dns_name_t *name; unsigned int options = 0; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); result = dns_byaddr_createptrname(&addr, options, name); if (result != ISC_R_SUCCESS) return (result); diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 2347c14ded4..85f1b01507a 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -353,8 +353,7 @@ get_reverse(char *reverse, size_t len, char *value, isc_boolean_t ip6_int, if (ip6_int) options |= DNS_BYADDROPT_IPV6INT; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); result = dns_byaddr_createptrname(&addr, options, name); if (result != ISC_R_SUCCESS) return (result); @@ -1933,8 +1932,7 @@ next_origin(dig_lookup_t *oldlookup) { /* * Check for a absolute name or ndots being met. */ - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_name_fromstring2(name, oldlookup->textname, NULL, 0, NULL); if (result == ISC_R_SUCCESS && @@ -2158,8 +2156,7 @@ setup_lookup(dig_lookup_t *lookup) { dns_fixedname_t fixed; dns_name_t *name; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); len = (unsigned int) strlen(textname); isc_buffer_init(&b, textname, len); isc_buffer_add(&b, len); diff --git a/bin/dig/host.c b/bin/dig/host.c index de835b67e58..29e898b4ec7 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -452,8 +452,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { dns_name_t *name; /* Add AAAA and MX lookups. */ - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); dns_name_copy(query->lookup->name, name, NULL); chase_cnamechain(msg, name); dns_name_format(name, namestr, sizeof(namestr)); diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 6379b933f26..ebb850209c8 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -475,8 +475,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { dns_name_t *name; /* Add AAAA lookup. */ - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); dns_name_copy(query->lookup->name, name, NULL); chase_cnamechain(msg, name); dns_name_format(name, namestr, sizeof(namestr)); diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c index a08fdc66dcc..89b9fa04047 100644 --- a/bin/dnssec/dnssec-cds.c +++ b/bin/dnssec/dnssec-cds.c @@ -173,8 +173,7 @@ initname(char *setname) { isc_result_t result; isc_buffer_t buf; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); namestr = setname; isc_buffer_init(&buf, setname, strlen(setname)); diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c index 051b6b5bba1..09f943b3ac5 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c @@ -67,8 +67,7 @@ initname(char *setname) { isc_result_t result; isc_buffer_t buf; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); isc_buffer_init(&buf, setname, strlen(setname)); isc_buffer_add(&buf, strlen(setname)); @@ -206,8 +205,7 @@ loadkey(char *filename, unsigned char *key_buf, unsigned int key_buf_size, rdclass = dst_key_class(key); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_name_copy(dst_key_name(key), name, NULL); if (result != ISC_R_SUCCESS) fatal("can't copy name"); diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c index e96d4fe50bc..7ba08a40819 100644 --- a/bin/dnssec/dnssec-importkey.c +++ b/bin/dnssec/dnssec-importkey.c @@ -72,8 +72,7 @@ initname(char *setname) { isc_result_t result; isc_buffer_t buf; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); isc_buffer_init(&buf, setname, strlen(setname)); isc_buffer_add(&buf, strlen(setname)); @@ -181,8 +180,7 @@ loadkey(char *filename, unsigned char *key_buf, unsigned int key_buf_size, rdclass = dst_key_class(key); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_name_copy(dst_key_name(key), name, NULL); if (result != ISC_R_SUCCESS) fatal("can't copy name"); diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c index 8e8797146d6..1d0b75bdf46 100644 --- a/bin/dnssec/dnssec-keyfromlabel.c +++ b/bin/dnssec/dnssec-keyfromlabel.c @@ -365,8 +365,7 @@ main(int argc, char **argv) { if (argc > isc_commandline_index + 1) fatal("extraneous arguments"); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); isc_buffer_init(&buf, argv[isc_commandline_index], strlen(argv[isc_commandline_index])); isc_buffer_add(&buf, strlen(argv[isc_commandline_index])); diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index ba20c32bf20..5f277281859 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -513,8 +513,7 @@ main(int argc, char **argv) { if (argc > isc_commandline_index + 1) fatal("extraneous arguments"); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); isc_buffer_init(&buf, argv[isc_commandline_index], strlen(argv[isc_commandline_index])); isc_buffer_add(&buf, strlen(argv[isc_commandline_index])); diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index c5e21ef8d6b..06c07685fc4 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -850,8 +850,7 @@ addnowildcardhash(hashlist_t *l, /*const*/ dns_name_t *name, isc_result_t result; char namestr[DNS_NAME_FORMATSIZE]; - dns_fixedname_init(&fixed); - wild = dns_fixedname_name(&fixed); + wild = dns_fixedname_initname(&fixed); result = dns_name_concatenate(dns_wildcardname, name, wild, NULL); if (result == ISC_R_NOSPACE) @@ -1237,8 +1236,7 @@ get_soa_ttls(void) { isc_result_t result; dns_rdata_t rdata = DNS_RDATA_INIT; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); dns_rdataset_init(&soaset); result = dns_db_find(gdb, gorigin, gversion, dns_rdatatype_soa, 0, 0, NULL, name, &soaset, NULL); @@ -1407,8 +1405,7 @@ signapex(void) { dns_name_t *name; isc_result_t result; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_dbiterator_seek(gdbiter, gorigin); check_result(result, "dns_dbiterator_seek()"); result = dns_dbiterator_current(gdbiter, &node, name); @@ -1458,8 +1455,7 @@ assignwork(isc_task_t *task, isc_task_t *worker) { fname = isc_mem_get(mctx, sizeof(dns_fixedname_t)); if (fname == NULL) fatal("out of memory"); - dns_fixedname_init(fname); - name = dns_fixedname_name(fname); + name = dns_fixedname_initname(fname); node = NULL; found = ISC_FALSE; while (!found) { @@ -1493,8 +1489,7 @@ assignwork(isc_task_t *task, isc_task_t *worker) { (zonecut == NULL || !dns_name_issubdomain(name, zonecut))) { if (is_delegation(gdb, gversion, gorigin, name, node, NULL)) { - dns_fixedname_init(&fzonecut); - zonecut = dns_fixedname_name(&fzonecut); + zonecut = dns_fixedname_initname(&fzonecut); dns_name_copy(name, zonecut, NULL); if (!OPTOUT(nsec3flags) || secure(name, node)) @@ -1737,10 +1732,8 @@ nsecify(void) { isc_uint32_t nsttl = 0; dns_rdataset_init(&rdataset); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); - dns_fixedname_init(&fnextname); - nextname = dns_fixedname_name(&fnextname); + name = dns_fixedname_initname(&fname); + nextname = dns_fixedname_initname(&fnextname); dns_fixedname_init(&fzonecut); zonecut = NULL; @@ -2152,8 +2145,7 @@ cleanup_zone(void) { dns_diff_init(mctx, &add); dns_diff_init(mctx, &del); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); dns_rdataset_init(&rdataset); result = dns_db_createiterator(gdb, 0, &dbiter); @@ -2213,10 +2205,8 @@ nsec3ify(unsigned int hashalg, dns_iterations_t iterations, unsigned int count, nlabels; dns_rdataset_init(&rdataset); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); - dns_fixedname_init(&fnextname); - nextname = dns_fixedname_name(&fnextname); + name = dns_fixedname_initname(&fname); + nextname = dns_fixedname_initname(&fnextname); dns_fixedname_init(&fzonecut); zonecut = NULL; @@ -2460,8 +2450,7 @@ loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) { isc_buffer_init(&b, origin, len); isc_buffer_add(&b, len); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) fatal("failed converting name '%s' to dns format: %s", @@ -2809,8 +2798,7 @@ set_nsec3params(isc_boolean_t update, isc_boolean_t set_salt, * (This assumes all NSEC3 records agree.) */ - dns_fixedname_init(&fname); - hashname = dns_fixedname_name(&fname); + hashname = dns_fixedname_initname(&fname); result = dns_nsec3_hashname(&fname, NULL, NULL, gorigin, gorigin, dns_hash_sha1, orig_iter, orig_salt, orig_saltlen); @@ -2899,8 +2887,7 @@ writeset(const char *prefix, dns_rdatatype_t type) { unsigned int labels; dns_name_init(&tname, NULL); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); labels = dns_name_countlabels(gorigin); dns_name_getlabelsequence(gorigin, 0, labels - 1, &tname); result = dns_name_concatenate(&tname, dlv, name, NULL); @@ -3366,8 +3353,7 @@ main(int argc, char *argv[]) { isc_buffer_init(&b, isc_commandline_argument, len); isc_buffer_add(&b, len); - dns_fixedname_init(&dlv_fixed); - dlv = dns_fixedname_name(&dlv_fixed); + dlv = dns_fixedname_initname(&dlv_fixed); result = dns_name_fromtext(dlv, &b, dns_rootname, 0, NULL); check_result(result, "dns_name_fromtext(dlv)"); diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c index 21b157cd4a7..961225491b1 100644 --- a/bin/dnssec/dnssec-verify.c +++ b/bin/dnssec/dnssec-verify.c @@ -97,8 +97,7 @@ loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) { isc_buffer_init(&b, origin, len); isc_buffer_add(&b, len); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) fatal("failed converting name '%s' to dns format: %s", diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index 2a7f0d00c7e..3de034e45a6 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -1717,10 +1717,8 @@ verifyzone(dns_db_t *db, dns_dbversion_t *ver, * present in the DNSKEY RRSET. */ - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); - dns_fixedname_init(&fnextname); - nextname = dns_fixedname_name(&fnextname); + name = dns_fixedname_initname(&fname); + nextname = dns_fixedname_initname(&fnextname); dns_fixedname_init(&fprevname); prevname = NULL; dns_fixedname_init(&fzonecut); diff --git a/bin/named/server.c b/bin/named/server.c index 0f6ea49248b..b945bf59a14 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -656,8 +656,7 @@ configure_view_nametable(const cfg_obj_t *vconfig, const cfg_obj_t *config, if (result != ISC_R_SUCCESS) return (result); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); for (element = cfg_list_first(obj); element != NULL; element = cfg_list_next(element)) { @@ -1095,8 +1094,7 @@ mustbesecure(const cfg_obj_t *mbs, dns_resolver_t *resolver) { isc_result_t result; isc_buffer_t b; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); for (element = cfg_list_first(mbs); element != NULL; element = cfg_list_next(element)) @@ -1532,8 +1530,7 @@ disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) { dns_name_t *name; isc_buffer_t b; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); str = cfg_obj_asstring(cfg_tuple_get(disabled, "name")); isc_buffer_constinit(&b, str, strlen(str)); isc_buffer_add(&b, strlen(str)); @@ -1578,8 +1575,7 @@ disable_ds_digests(const cfg_obj_t *disabled, dns_resolver_t *resolver) { dns_name_t *name; isc_buffer_t b; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); str = cfg_obj_asstring(cfg_tuple_get(disabled, "name")); isc_buffer_constinit(&b, str, strlen(str)); isc_buffer_add(&b, strlen(str)); @@ -1620,8 +1616,7 @@ on_disable_list(const cfg_obj_t *disablelist, dns_name_t *zonename) { const char *str; isc_buffer_t b; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); for (element = cfg_list_first(disablelist); element != NULL; @@ -1815,8 +1810,7 @@ dns64_reverse(dns_view_t *view, isc_mem_t *mctx, isc_netaddr_t *na, dns64_dbtype[2] = server; if (contact != NULL) dns64_dbtype[3] = contact; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); isc_buffer_constinit(&b, reverse, strlen(reverse)); isc_buffer_add(&b, strlen(reverse)); CHECK(dns_name_fromtext(name, &b, dns_rootname, 0, NULL)); @@ -3228,12 +3222,9 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view, int order; unsigned int nlabels; - dns_fixedname_init(&fixed); - zname = dns_fixedname_name(&fixed); - dns_fixedname_init(&nsfixed); - ns = dns_fixedname_name(&nsfixed); - dns_fixedname_init(&cfixed); - contact = dns_fixedname_name(&cfixed); + zname = dns_fixedname_initname(&fixed); + ns = dns_fixedname_initname(&nsfixed); + contact = dns_fixedname_initname(&cfixed); /* * Look for forward "zones" beneath this empty zone and if so @@ -5030,10 +5021,9 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, if (result == ISC_R_SUCCESS) { dns_name_t *dlv, *iscdlv; dns_fixedname_t f; - dns_fixedname_init(&f); /* Also log a warning if manually configured to dlv.isc.org */ - iscdlv = dns_fixedname_name(&f); + iscdlv = dns_fixedname_initname(&f); CHECK(dns_name_fromstring(iscdlv, "dlv.isc.org", 0, NULL)); for (element = cfg_list_first(obj); @@ -5103,8 +5093,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, dns_fixedname_t fixed; dns_name_t *name; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); for (element = cfg_list_first(obj); element != NULL; element = cfg_list_next(element)) @@ -5179,8 +5168,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, int empty_dbtypec = 4; dns_zonestat_level_t statlevel; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); obj = NULL; result = named_config_get(maps, "empty-server", &obj); @@ -5423,8 +5411,7 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, isc_buffer_constinit(&buffer, str, strlen(str)); isc_buffer_add(&buffer, strlen(str)); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); CHECK(dns_name_fromtext(name, &buffer, dns_rootname, 0, NULL)); @@ -6538,8 +6525,7 @@ dotat(dns_keytable_t *keytable, dns_keynode_t *keynode, void *arg) { } isc_textregion_consume(&r, m); } - dns_fixedname_init(&fixed); - tatname = dns_fixedname_name(&fixed); + tatname = dns_fixedname_initname(&fixed); result = dns_name_fromstring2(tatname, label, name, 0, NULL); if (result != ISC_R_SUCCESS) { return; @@ -6916,10 +6902,9 @@ configure_session_key(const cfg_obj_t **maps, named_server_t *server, result = named_config_get(maps, "session-keyname", &obj); INSIST(result == ISC_R_SUCCESS); keynamestr = cfg_obj_asstring(obj); - dns_fixedname_init(&fname); isc_buffer_constinit(&buffer, keynamestr, strlen(keynamestr)); isc_buffer_add(&buffer, strlen(keynamestr)); - keyname = dns_fixedname_name(&fname); + keyname = dns_fixedname_initname(&fname); result = dns_name_fromtext(keyname, &buffer, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) return (result); @@ -7225,8 +7210,7 @@ configure_zone_setviewcommit(isc_result_t result, const cfg_obj_t *zconfig, dns_zone_t *raw = NULL; zname = cfg_obj_asstring(cfg_tuple_get(zconfig, "name")); - dns_fixedname_init(&fixorigin); - origin = dns_fixedname_name(&fixorigin); + origin = dns_fixedname_initname(&fixorigin); result2 = dns_name_fromstring(origin, zname, 0, NULL); if (result2 != ISC_R_SUCCESS) { @@ -7574,8 +7558,7 @@ get_newzone_config(dns_view_t *view, const char *zonename, /* Normalize zone name */ isc_buffer_constinit(&b, zonename, strlen(zonename)); isc_buffer_add(&b, strlen(zonename)); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); CHECK(dns_name_fromtext(name, &b, dns_rootname, DNS_NAME_DOWNCASE, NULL)); dns_name_format(name, zname, sizeof(zname)); @@ -9911,8 +9894,7 @@ zone_from_args(named_server_t *server, isc_lex_t *lex, const char *zonetxt, strlcpy(zonename, redirect ? "." : zonetxt, DNS_NAME_FORMATSIZE); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); CHECK(dns_name_fromstring(name, zonebuf, 0, NULL)); /* Look for the optional class name. */ @@ -11072,8 +11054,7 @@ named_server_flushnode(named_server_t *server, isc_lex_t *lex, strlcpy(target, ptr, DNS_NAME_FORMATSIZE); isc_buffer_constinit(&b, target, strlen(target)); isc_buffer_add(&b, strlen(target)); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) return (result); @@ -11298,8 +11279,7 @@ delete_keynames(dns_tsig_keyring_t *ring, char *target, dns_tsigkey_t *tkey; dns_name_init(&foundname, NULL); - dns_fixedname_init(&fixedorigin); - origin = dns_fixedname_name(&fixedorigin); + origin = dns_fixedname_initname(&fixedorigin); again: dns_rbtnodechain_init(&chain, ring->mctx); @@ -11417,8 +11397,7 @@ list_keynames(dns_view_t *view, dns_tsig_keyring_t *ring, isc_buffer_t **text, viewname = "(global)"; dns_name_init(&foundname, NULL); - dns_fixedname_init(&fixedorigin); - origin = dns_fixedname_name(&fixedorigin); + origin = dns_fixedname_initname(&fixedorigin); dns_rbtnodechain_init(&chain, ring->mctx); result = dns_rbtnodechain_first(&chain, ring->keys, &foundname, origin); @@ -12363,8 +12342,7 @@ migrate_nzf(dns_view_t *view) { /* Normalize zone name */ isc_buffer_constinit(&b, origin, strlen(origin)); isc_buffer_add(&b, strlen(origin)); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); CHECK(dns_name_fromtext(name, &b, dns_rootname, DNS_NAME_DOWNCASE, NULL)); dns_name_format(name, zname, sizeof(zname)); @@ -12576,8 +12554,7 @@ delete_zoneconf(dns_view_t *view, cfg_parser_t *pctx, DE_CONST(&zl->value.list, list); - dns_fixedname_init(&myfixed); - myname = dns_fixedname_name(&myfixed); + myname = dns_fixedname_initname(&myfixed); for (elt = ISC_LIST_HEAD(*list); elt != NULL; @@ -13054,8 +13031,7 @@ named_server_changezone(named_server_t *server, char *command, isc_buffer_constinit(&buf, zonename, strlen(zonename)); isc_buffer_add(&buf, strlen(zonename)); - dns_fixedname_init(&fname); - dnsname = dns_fixedname_name(&fname); + dnsname = dns_fixedname_initname(&fname); CHECK(dns_name_fromtext(dnsname, &buf, dns_rootname, 0, NULL)); if (redirect) { @@ -13433,10 +13409,8 @@ find_name_in_list_from_map(const cfg_obj_t *config, isc_result_t result; if (strcmp(map_key_for_list, "zone") == 0) { - dns_fixedname_init(&fixed1); - dns_fixedname_init(&fixed2); - name1 = dns_fixedname_name(&fixed1); - name2 = dns_fixedname_name(&fixed2); + name1 = dns_fixedname_initname(&fixed1); + name2 = dns_fixedname_initname(&fixed2); result = dns_name_fromstring(name1, name, 0, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); } @@ -14006,8 +13980,7 @@ named_server_zonestatus(named_server_t *server, isc_lex_t *lex, dns_rdataset_t next; dns_rdataset_init(&next); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_db_getsigningtime(db, &next, name); if (result == ISC_R_SUCCESS) { @@ -14189,8 +14162,7 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, UNUSED(force); - dns_fixedname_init(&fn); - fname = dns_fixedname_name(&fn); + fname = dns_fixedname_initname(&fn); /* Skip the command name. */ ptr = next_token(lex, text); diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c index 16434507743..0a07de502a2 100644 --- a/bin/named/tkeyconf.c +++ b/bin/named/tkeyconf.c @@ -69,8 +69,7 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, n = cfg_obj_asuint32(cfg_tuple_get(obj, "keyid")); isc_buffer_constinit(&b, s, strlen(s)); isc_buffer_add(&b, strlen(s)); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); RETERR(dns_name_fromtext(name, &b, dns_rootname, 0, NULL)); type = DST_TYPE_PUBLIC|DST_TYPE_PRIVATE|DST_TYPE_KEY; RETERR(dst_key_fromfile(name, (dns_keytag_t) n, DNS_KEYALG_DH, @@ -83,8 +82,7 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, s = cfg_obj_asstring(obj); isc_buffer_constinit(&b, s, strlen(s)); isc_buffer_add(&b, strlen(s)); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); RETERR(dns_name_fromtext(name, &b, dns_rootname, 0, NULL)); tctx->domain = isc_mem_get(mctx, sizeof(dns_name_t)); if (tctx->domain == NULL) { @@ -102,8 +100,7 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, isc_buffer_constinit(&b, s, strlen(s)); isc_buffer_add(&b, strlen(s)); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); RETERR(dns_name_fromtext(name, &b, dns_rootname, 0, NULL)); RETERR(dst_gssapi_acquirecred(name, ISC_FALSE, &tctx->gsscred)); } diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index bddbd18f485..d54de81e1e0 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -499,8 +499,7 @@ configure_staticstub_servernames(const cfg_obj_t *zconfig, dns_zone_t *zone, obj = cfg_listelt_value(element); str = cfg_obj_asstring(obj); - dns_fixedname_init(&fixed_name); - nsname = dns_fixedname_name(&fixed_name); + nsname = dns_fixedname_initname(&fixed_name); isc_buffer_constinit(&b, str, strlen(str)); isc_buffer_add(&b, strlen(str)); diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 4c416ab8806..e753f74c992 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -565,8 +565,7 @@ setup_keystr(void) { const dns_name_t *hmacname = NULL; isc_uint16_t digestbits = 0; - dns_fixedname_init(&fkeyname); - mykeyname = dns_fixedname_name(&fkeyname); + mykeyname = dns_fixedname_initname(&fkeyname); debug("Creating key..."); @@ -1646,8 +1645,7 @@ evaluate_key(char *cmdline) { return (STATUS_SYNTAX); } - dns_fixedname_init(&fkeyname); - mykeyname = dns_fixedname_name(&fkeyname); + mykeyname = dns_fixedname_initname(&fkeyname); n = strchr(namestr, ':'); if (n != NULL) { @@ -1718,8 +1716,7 @@ evaluate_zone(char *cmdline) { return (STATUS_SYNTAX); } - dns_fixedname_init(&fuserzone); - userzone = dns_fixedname_name(&fuserzone); + userzone = dns_fixedname_initname(&fuserzone); isc_buffer_init(&b, word, strlen(word)); isc_buffer_add(&b, strlen(word)); result = dns_name_fromtext(userzone, &b, dns_rootname, 0, NULL); @@ -1988,8 +1985,7 @@ update_addordelete(char *cmdline, isc_boolean_t isdelete) { goto failure; } - dns_fixedname_init(&fixed); - bad = dns_fixedname_name(&fixed); + bad = dns_fixedname_initname(&fixed); if (!dns_rdata_checknames(rdata, name, bad)) { char namebuf[DNS_NAME_FORMATSIZE]; @@ -2703,8 +2699,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) { * Save the zone name in case we need to try a second * address. */ - dns_fixedname_init(&fzname); - zname = dns_fixedname_name(&fzname); + zname = dns_fixedname_initname(&fzname); dns_name_copy(name, zname, NULL); } @@ -2910,8 +2905,7 @@ start_gssrequest(dns_name_t *master) { memmove(kserver, &master_servers[master_inuse], sizeof(isc_sockaddr_t)); - dns_fixedname_init(&fname); - servname = dns_fixedname_name(&fname); + servname = dns_fixedname_initname(&fname); if (realm == NULL) get_ticket_realm(gmctx); @@ -2928,8 +2922,7 @@ start_gssrequest(dns_name_t *master) { fatal("dns_name_fromtext(servname) failed: %s", isc_result_totext(result)); - dns_fixedname_init(&fkname); - keyname = dns_fixedname_name(&fkname); + keyname = dns_fixedname_initname(&fkname); isc_random_get(&val); result = isc_string_printf(mykeystr, sizeof(mykeystr), "%u.sig-%s", @@ -3102,8 +3095,7 @@ recvgss(isc_task_t *task, isc_event_t *event) { fatal("response to GSS-TSIG query was unsuccessful"); - dns_fixedname_init(&fname); - servname = dns_fixedname_name(&fname); + servname = dns_fixedname_initname(&fname); isc_buffer_init(&buf, servicename, strlen(servicename)); isc_buffer_add(&buf, strlen(servicename)); result = dns_name_fromtext(servname, &buf, dns_rootname, 0, NULL); diff --git a/bin/tests/makejournal.c b/bin/tests/makejournal.c index 36cd32b3321..1fa9e31d84a 100644 --- a/bin/tests/makejournal.c +++ b/bin/tests/makejournal.c @@ -63,8 +63,7 @@ loadzone(dns_db_t **db, const char *origin, const char *filename) { dns_fixedname_t fixed; dns_name_t *name; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_name_fromstring(name, origin, 0, NULL); if (result != ISC_R_SUCCESS) diff --git a/bin/tests/optional/db_test.c b/bin/tests/optional/db_test.c index b3903cca754..6c1c2404e53 100644 --- a/bin/tests/optional/db_test.c +++ b/bin/tests/optional/db_test.c @@ -121,8 +121,7 @@ select_db(char *origintext) { len = strlen(origintext); isc_buffer_init(&source, origintext, len); isc_buffer_add(&source, len); - dns_fixedname_init(&forigin); - origin = dns_fixedname_name(&forigin); + origin = dns_fixedname_initname(&forigin); result = dns_name_fromtext(origin, &source, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { print_result("bad name", result); @@ -152,8 +151,7 @@ list(dbinfo *dbi, char *seektext) { dns_name_t *seekname; isc_buffer_t source; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); if (dbi->dbiterator == NULL) { INSIST(dbi->iversion == NULL); @@ -171,8 +169,7 @@ list(dbinfo *dbi, char *seektext) { len = strlen(seektext); isc_buffer_init(&source, seektext, len); isc_buffer_add(&source, len); - dns_fixedname_init(&fseekname); - seekname = dns_fixedname_name(&fseekname); + seekname = dns_fixedname_initname(&fseekname); result = dns_name_fromtext(seekname, &source, dns_db_origin( dbi->db), @@ -256,8 +253,7 @@ load(const char *filename, const char *origintext, isc_boolean_t cache) { len = strlen(origintext); isc_buffer_constinit(&source, origintext, len); isc_buffer_add(&source, len); - dns_fixedname_init(&forigin); - origin = dns_fixedname_name(&forigin); + origin = dns_fixedname_initname(&forigin); result = dns_name_fromtext(origin, &source, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { isc_mem_put(mctx, dbi, sizeof(*dbi)); @@ -454,8 +450,7 @@ main(int argc, char *argv[]) { /* * Some final initialization... */ - dns_fixedname_init(&foundname); - fname = dns_fixedname_name(&foundname); + fname = dns_fixedname_initname(&foundname); dbi = NULL; origin = dns_rootname; version = NULL; diff --git a/bin/tests/optional/dst_test.c b/bin/tests/optional/dst_test.c index 30f071e4f1a..32492b025b3 100644 --- a/bin/tests/optional/dst_test.c +++ b/bin/tests/optional/dst_test.c @@ -257,8 +257,7 @@ main(void) { dst_lib_init(mctx, ectx, NULL, ISC_ENTROPY_BLOCKING|ISC_ENTROPY_GOODONLY); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); isc_buffer_constinit(&b, "test.", 5); isc_buffer_add(&b, 5); result = dns_name_fromtext(name, &b, NULL, 0, NULL); diff --git a/bin/tests/optional/name_test.c b/bin/tests/optional/name_test.c index c9837418798..08e05ccf96d 100644 --- a/bin/tests/optional/name_test.c +++ b/bin/tests/optional/name_test.c @@ -156,8 +156,7 @@ main(int argc, char *argv[]) { } else comp = NULL; - dns_fixedname_init(&wname); - name = dns_fixedname_name(&wname); + name = dns_fixedname_initname(&wname); dns_fixedname_init(&wname2); while (fgets(s, sizeof(s), stdin) != NULL) { len = strlen(s); @@ -267,8 +266,7 @@ main(int argc, char *argv[]) { if (inplace) { down = name; } else { - dns_fixedname_init(&downname); - down = dns_fixedname_name(&downname); + down = dns_fixedname_initname(&downname); } result = dns_name_downcase(name, down, NULL); INSIST(result == ISC_R_SUCCESS); @@ -321,10 +319,8 @@ main(int argc, char *argv[]) { labels = dns_name_countlabels(name); if (want_split && split_label < labels) { - dns_fixedname_init(&fprefix); - prefix = dns_fixedname_name(&fprefix); - dns_fixedname_init(&fsuffix); - suffix = dns_fixedname_name(&fsuffix); + prefix = dns_fixedname_initname(&fprefix); + suffix = dns_fixedname_initname(&fsuffix); printf("splitting at label %u: ", split_label); dns_name_split(name, split_label, prefix, suffix); printf("\n prefix = "); diff --git a/bin/tests/optional/nsecify.c b/bin/tests/optional/nsecify.c index 3413399ec30..5a22d5863eb 100644 --- a/bin/tests/optional/nsecify.c +++ b/bin/tests/optional/nsecify.c @@ -118,10 +118,8 @@ nsecify(char *filename) { dns_dbiterator_t *dbiter; char newfilename[1024]; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); - dns_fixedname_init(&fnextname); - nextname = dns_fixedname_name(&fnextname); + name = dns_fixedname_initname(&fname); + nextname = dns_fixedname_initname(&fnextname); origintext = strrchr(filename, '/'); if (origintext == NULL) diff --git a/bin/tests/optional/rbt_test.c b/bin/tests/optional/rbt_test.c index 055586d7471..d5e7d502bb7 100644 --- a/bin/tests/optional/rbt_test.c +++ b/bin/tests/optional/rbt_test.c @@ -110,13 +110,9 @@ detail(dns_rbt_t *rbt, dns_name_t *name) { dns_rbtnodechain_init(&chain, mctx); - dns_fixedname_init(&fixedorigin); - dns_fixedname_init(&fixedfullname); - dns_fixedname_init(&fixedfoundname); - - origin = dns_fixedname_name(&fixedorigin); - fullname = dns_fixedname_name(&fixedfullname); - foundname = dns_fixedname_name(&fixedfoundname); + origin = dns_fixedname_initname(&fixedorigin); + fullname = dns_fixedname_initname(&fixedfullname); + foundname = dns_fixedname_initname(&fixedfoundname); node1 = node2 = NULL; @@ -194,8 +190,7 @@ iterate(dns_rbt_t *rbt, isc_boolean_t forward) { dns_rbtnodechain_init(&chain, mctx); dns_name_init(&foundname, NULL); - dns_fixedname_init(&fixedorigin); - origin = dns_fixedname_name(&fixedorigin); + origin = dns_fixedname_initname(&fixedorigin); if (forward) { printf("iterating forward\n" ); @@ -363,9 +358,8 @@ main(int argc, char **argv) { printf("searching for name %s ... ", arg); - dns_fixedname_init(&fixedname); foundname = - dns_fixedname_name(&fixedname); + dns_fixedname_initname(&fixedname); data = NULL; result = dns_rbt_findname(rbt, name, 0, diff --git a/bin/tests/optional/sig0_test.c b/bin/tests/optional/sig0_test.c index a8db222ba43..eb2ccc91c1f 100644 --- a/bin/tests/optional/sig0_test.c +++ b/bin/tests/optional/sig0_test.c @@ -251,8 +251,7 @@ main(int argc, char *argv[]) { inaddr.s_addr = htonl(INADDR_LOOPBACK); isc_sockaddr_fromin(&address, &inaddr, port); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); isc_buffer_constinit(&b, "child.example.", strlen("child.example.")); isc_buffer_add(&b, strlen("child.example.")); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); diff --git a/bin/tests/system/dyndb/driver/instance.c b/bin/tests/system/dyndb/driver/instance.c index f2207b9435c..f1bd84e814a 100644 --- a/bin/tests/system/dyndb/driver/instance.c +++ b/bin/tests/system/dyndb/driver/instance.c @@ -90,11 +90,8 @@ new_sample_instance(isc_mem_t *mctx, const char *db_name, goto cleanup; } - dns_fixedname_init(&inst->zone1_fn); - inst->zone1_name = dns_fixedname_name(&inst->zone1_fn); - - dns_fixedname_init(&inst->zone2_fn); - inst->zone2_name = dns_fixedname_name(&inst->zone2_fn); + inst->zone1_name = dns_fixedname_initname(&inst->zone1_fn); + inst->zone2_name = dns_fixedname_initname(&inst->zone2_fn); CHECK(parse_params(mctx, argc, argv, inst->zone1_name, inst->zone2_name)); diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c index 0100c39f0af..d9dde40cd57 100644 --- a/bin/tests/system/rsabigexponent/bigkey.c +++ b/bin/tests/system/rsabigexponent/bigkey.c @@ -210,8 +210,7 @@ main(int argc, char **argv) { "isc_log_createchannel()"); CHECK(isc_log_usechannel(logconfig, "stderr", NULL, NULL), "isc_log_usechannel()"); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); isc_buffer_constinit(&buf, "example.", strlen("example.")); isc_buffer_add(&buf, strlen("example.")); CHECK(dns_name_fromtext(name, &buf, dns_rootname, 0, NULL), diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c index cdc108b9713..8f80248e793 100644 --- a/bin/tools/dnstap-read.c +++ b/bin/tools/dnstap-read.c @@ -272,8 +272,7 @@ print_yaml(dns_dtdata_t *dt) { isc_buffer_t b; dns_decompress_t dctx; - dns_fixedname_init(&fn); - name = dns_fixedname_name(&fn); + name = dns_fixedname_initname(&fn); isc_buffer_init(&b, m->query_zone.data, m->query_zone.len); isc_buffer_add(&b, m->query_zone.len); diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index 82bb5c2d58c..5cac77ef64d 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -1002,8 +1002,7 @@ get_reverse(char *reverse, size_t len, const char *value, if (ip6_int) options |= DNS_BYADDROPT_IPV6INT; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); result = dns_byaddr_createptrname(&addr, options, name); CHECK("dns_byaddr_createptrname2", result); dns_name_format(name, reverse, (unsigned int)len); diff --git a/bin/tools/named-rrchecker.c b/bin/tools/named-rrchecker.c index 602457ce663..2313b39eee8 100644 --- a/bin/tools/named-rrchecker.c +++ b/bin/tools/named-rrchecker.c @@ -164,8 +164,7 @@ main(int argc, char *argv[]) { RUNTIME_CHECK(isc_lex_openstream(lex, stdin) == ISC_R_SUCCESS); if (origin != NULL) { - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_name_fromstring(name, origin, 0, NULL); if (result != ISC_R_SUCCESS) { fatal("dns_name_fromstring: %s", diff --git a/bin/tools/nsec3hash.c b/bin/tools/nsec3hash.c index 0b1632b449e..6a468560abb 100644 --- a/bin/tools/nsec3hash.c +++ b/bin/tools/nsec3hash.c @@ -109,8 +109,7 @@ nsec3hash(nsec3printer *nsec3print, const char *algostr, const char *flagstr, if (iterations > 0xffffU) fatal("iterations to large"); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); isc_buffer_constinit(&buffer, domain, strlen(domain)); isc_buffer_add(&buffer, strlen(domain)); result = dns_name_fromtext(name, &buffer, dns_rootname, 0, NULL); diff --git a/contrib/dnsperf-2.1.0.0-1/dns.c b/contrib/dnsperf-2.1.0.0-1/dns.c index be16490b21a..d442deecec2 100644 --- a/contrib/dnsperf-2.1.0.0-1/dns.c +++ b/contrib/dnsperf-2.1.0.0-1/dns.c @@ -259,8 +259,7 @@ perf_dns_parsetsigkey(const char *arg, isc_mem_t *mctx) /* Name */ - dns_fixedname_init(&tsigkey->fname); - tsigkey->name = dns_fixedname_name(&tsigkey->fname); + tsigkey->name = dns_fixedname_initname(&tsigkey->fname); result = name_fromstring(tsigkey->name, dns_rootname, name, namelen, NULL, "TSIG key"); if (result != ISC_R_SUCCESS) { @@ -663,12 +662,10 @@ build_update(perf_dnsctx_t *ctx, const isc_textregion_t *record, /* Initialize */ - dns_fixedname_init(&foname); - oname = dns_fixedname_name(&foname); + oname = dns_fixedname_initname(&foname); /* Parse zone name */ - dns_fixedname_init(&fzname); - zname = dns_fixedname_name(&fzname); + zname = dns_fixedname_initname(&fzname); result = name_fromstring(zname, dns_rootname, input.base, strlen(input.base), NULL, "zone"); diff --git a/contrib/sdb/ldap/zone2ldap.c b/contrib/sdb/ldap/zone2ldap.c index 61ef42c0ca2..a8e49555da7 100644 --- a/contrib/sdb/ldap/zone2ldap.c +++ b/contrib/sdb/ldap/zone2ldap.c @@ -219,8 +219,7 @@ main (int argc, char **argv) isc_buffer_init (&buff, argzone, strlen (argzone)); isc_buffer_add (&buff, strlen (argzone)); - dns_fixedname_init (&fixedzone); - zone = dns_fixedname_name (&fixedzone); + zone = dns_fixedname_initname(&fixedzone); result = dns_name_fromtext (zone, &buff, dns_rootname, 0, NULL); isc_result_check (result, "dns_name_fromtext"); @@ -237,8 +236,7 @@ main (int argc, char **argv) result = dns_dbiterator_first (dbit); isc_result_check (result, "dns_dbiterator_first"); - dns_fixedname_init (&fixedname); - name = dns_fixedname_name (&fixedname); + name = dns_fixedname_initname(&fixedname); dns_rdataset_init (&rdataset); dns_rdata_init (&rdata); diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c index 6a1562c8d72..898ed28839d 100644 --- a/contrib/sdb/pgsql/zonetodb.c +++ b/contrib/sdb/pgsql/zonetodb.c @@ -163,8 +163,7 @@ main(int argc, char **argv) { isc_buffer_init(&b, porigin, strlen(porigin)); isc_buffer_add(&b, strlen(porigin)); - dns_fixedname_init(&forigin); - origin = dns_fixedname_name(&forigin); + origin = dns_fixedname_initname(&forigin); result = dns_name_fromtext(origin, &b, dns_rootname, 0, NULL); check_result(result, "dns_name_fromtext"); @@ -227,8 +226,7 @@ main(int argc, char **argv) { result = dns_dbiterator_first(dbiter); check_result(result, "dns_dbiterator_first"); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); dns_rdataset_init(&rdataset); dns_rdata_init(&rdata); diff --git a/contrib/sdb/sqlite/zone2sqlite.c b/contrib/sdb/sqlite/zone2sqlite.c index 4137c7d2c7f..cf6747d4ed4 100644 --- a/contrib/sdb/sqlite/zone2sqlite.c +++ b/contrib/sdb/sqlite/zone2sqlite.c @@ -172,8 +172,7 @@ main(int argc, char *argv[]) isc_buffer_init(&b, porigin, strlen(porigin)); isc_buffer_add(&b, strlen(porigin)); - dns_fixedname_init(&forigin); - origin = dns_fixedname_name(&forigin); + origin = dns_fixedname_initname(&forigin); result = dns_name_fromtext(origin, &b, dns_rootname, 0, NULL); check_result(result, "dns_name_fromtext"); @@ -237,8 +236,7 @@ main(int argc, char *argv[]) result = dns_dbiterator_first(dbiter); check_result(result, "dns_dbiterator_first"); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); dns_rdataset_init(&rdataset); dns_rdata_init(&rdata); diff --git a/doc/dev/dev.md b/doc/dev/dev.md index 2cd10f4dff7..5955c09e4b2 100644 --- a/doc/dev/dev.md +++ b/doc/dev/dev.md @@ -872,8 +872,7 @@ name. This allows names to be stack-allocated with minimal initialization: dns_fixedname_t fn; dns_name_t *name; - dns_fixedname_init(&fn) - name = dns_fixedname_name(&fn); + name = dns_fixedname_initname(&fn); `name` is now a pointer to a `dns_name` object in which a name can be stored for the duration of this function; there is no need to initialize, diff --git a/lib/bind9/check.c b/lib/bind9/check.c index a17359e3a2f..db9226907cd 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -221,8 +221,7 @@ check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) { str = cfg_obj_asstring(obj); isc_buffer_constinit(&buffer, str, strlen(str)); isc_buffer_add(&buffer, strlen(str)); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); tresult = dns_name_fromtext(name, &buffer, dns_rootname, 0, NULL); if (tresult != ISC_R_SUCCESS) { @@ -283,8 +282,7 @@ disabled_algorithms(const cfg_obj_t *disabled, isc_log_t *logctx) { dns_name_t *name; const cfg_obj_t *obj; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); obj = cfg_tuple_get(disabled, "name"); str = cfg_obj_asstring(obj); isc_buffer_constinit(&b, str, strlen(str)); @@ -330,8 +328,7 @@ disabled_ds_digests(const cfg_obj_t *disabled, isc_log_t *logctx) { dns_name_t *name; const cfg_obj_t *obj; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); obj = cfg_tuple_get(disabled, "name"); str = cfg_obj_asstring(obj); isc_buffer_constinit(&b, str, strlen(str)); @@ -413,8 +410,7 @@ mustbesecure(const cfg_obj_t *secure, isc_symtab_t *symtab, isc_log_t *logctx, isc_buffer_t b; isc_result_t result = ISC_R_SUCCESS; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); obj = cfg_tuple_get(secure, "name"); str = cfg_obj_asstring(obj); isc_buffer_constinit(&b, str, strlen(str)); @@ -1156,8 +1152,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, } } - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); /* * Check the DLV zone name. @@ -1750,10 +1745,8 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) { const cfg_obj_t *typelist = cfg_tuple_get(stmt, "types"); dns_ssumatchtype_t mtype; - dns_fixedname_init(&fixed_id); - dns_fixedname_init(&fixed_name); - id = dns_fixedname_name(&fixed_id); - name = dns_fixedname_name(&fixed_name); + id = dns_fixedname_initname(&fixed_id); + name = dns_fixedname_initname(&fixed_name); tresult = dns_ssu_mtypefromstring(cfg_obj_asstring(matchtype), &mtype); @@ -2408,10 +2401,9 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, obj = cfg_listelt_value(element); snamestr = cfg_obj_asstring(obj); - dns_fixedname_init(&fixed_sname); isc_buffer_constinit(&b2, snamestr, strlen(snamestr)); isc_buffer_add(&b2, strlen(snamestr)); - sname = dns_fixedname_name(&fixed_sname); + sname = dns_fixedname_initname(&fixed_sname); tresult = dns_name_fromtext(sname, &b2, dns_rootname, 0, NULL); if (tresult != ISC_R_SUCCESS) { @@ -2715,8 +2707,7 @@ check_keylist(const cfg_obj_t *keys, isc_symtab_t *symtab, isc_result_t tresult; const cfg_listelt_t *element; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); for (element = cfg_list_first(keys); element != NULL; element = cfg_list_next(element)) @@ -2895,10 +2886,9 @@ check_servers(const cfg_obj_t *config, const cfg_obj_t *voptions, * Normalize key name. */ keyval = cfg_obj_asstring(keys); - dns_fixedname_init(&fname); isc_buffer_constinit(&b, keyval, strlen(keyval)); isc_buffer_add(&b, strlen(keyval)); - keyname = dns_fixedname_name(&fname); + keyname = dns_fixedname_initname(&fname); tresult = dns_name_fromtext(keyname, &b, dns_rootname, 0, NULL); if (tresult != ISC_R_SUCCESS) { @@ -2941,8 +2931,7 @@ check_trusted_key(const cfg_obj_t *key, isc_boolean_t managed, proto = cfg_obj_asuint32(cfg_tuple_get(key, "protocol")); alg = cfg_obj_asuint32(cfg_tuple_get(key, "algorithm")); - dns_fixedname_init(&fkeyname); - keyname = dns_fixedname_name(&fkeyname); + keyname = dns_fixedname_initname(&fkeyname); keynamestr = cfg_obj_asstring(cfg_tuple_get(key, "name")); isc_buffer_constinit(&b, keynamestr, strlen(keynamestr)); @@ -3155,8 +3144,7 @@ check_rpz_catz(const char *rpz_catz, const cfg_obj_t *rpz_obj, } result = ISC_R_SUCCESS; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); obj = cfg_tuple_get(rpz_obj, "zone list"); for (element = cfg_list_first(obj); diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 8dd8f319ec0..567ed6614ed 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -1429,10 +1429,8 @@ set_target(dns_adb_t *adb, const dns_name_t *name, const dns_name_t *fname, /* * Construct the new target name. */ - dns_fixedname_init(&fixed1); - prefix = dns_fixedname_name(&fixed1); - dns_fixedname_init(&fixed2); - new_target = dns_fixedname_name(&fixed2); + prefix = dns_fixedname_initname(&fixed1); + new_target = dns_fixedname_initname(&fixed2); dns_name_split(name, nlabels, prefix, NULL); result = dns_name_concatenate(prefix, &dname.dname, new_target, NULL); @@ -3683,8 +3681,7 @@ dbfind_name(dns_adbname_t *adbname, isc_stdtime_t now, dns_rdatatype_t rdtype) INSIST(DNS_ADB_VALID(adb)); INSIST(rdtype == dns_rdatatype_a || rdtype == dns_rdatatype_aaaa); - dns_fixedname_init(&foundname); - fname = dns_fixedname_name(&foundname); + fname = dns_fixedname_initname(&foundname); dns_rdataset_init(&rdataset); if (rdtype == dns_rdatatype_a) @@ -4025,8 +4022,7 @@ fetch_name(dns_adbname_t *adbname, isc_boolean_t start_at_zone, DP(ENTER_LEVEL, "fetch_name: starting at zone for name %p", adbname); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_view_findzonecut(adb->view, &adbname->name, name, 0, 0, ISC_TRUE, ISC_FALSE, &rdataset, NULL); diff --git a/lib/dns/cache.c b/lib/dns/cache.c index fc640ae616b..5ed06107a1e 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -1233,8 +1233,7 @@ cleartree(dns_db_t *db, const dns_name_t *name) { */ (void)dns_db_findnode(db, name, ISC_TRUE, &top); - dns_fixedname_init(&fnodename); - nodename = dns_fixedname_name(&fnodename); + nodename = dns_fixedname_initname(&fnodename); result = dns_db_createiterator(db, 0, &iter); if (result != ISC_R_SUCCESS) diff --git a/lib/dns/catz.c b/lib/dns/catz.c index cd7575d582c..f1ad5599393 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -1803,8 +1803,7 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) { return; } - dns_fixedname_init(&fixname); - name = dns_fixedname_name(&fixname); + name = dns_fixedname_initname(&fixname); /* * Iterate over database to fill the new zone. diff --git a/lib/dns/client.c b/lib/dns/client.c index 9d044446e89..cb35938c4b8 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -839,8 +839,7 @@ client_resfind(resctx_t *rctx, dns_fetchevent_t *event) { want_restart = ISC_FALSE; if (event == NULL && !rctx->canceled) { - dns_fixedname_init(&foundname); - fname = dns_fixedname_name(&foundname); + fname = dns_fixedname_initname(&foundname); INSIST(!dns_rdataset_isassociated(rctx->rdataset)); INSIST(rctx->sigrdataset == NULL || !dns_rdataset_isassociated(rctx->sigrdataset)); @@ -983,8 +982,7 @@ client_resfind(resctx_t *rctx, dns_fetchevent_t *event) { /* * Construct the new query name and start over. */ - dns_fixedname_init(&fixed); - prefix = dns_fixedname_name(&fixed); + prefix = dns_fixedname_initname(&fixed); dns_name_split(name, nlabels, prefix, NULL); tresult = dns_name_concatenate(prefix, &dname.dname, name, NULL); diff --git a/lib/dns/ds.c b/lib/dns/ds.c index 28a5c3efe38..e24c176e489 100644 --- a/lib/dns/ds.c +++ b/lib/dns/ds.c @@ -60,8 +60,7 @@ dns_ds_buildrdata(dns_name_t *owner, dns_rdata_t *key, if (!dst_ds_digest_supported(digest_type)) return (ISC_R_NOTIMPLEMENTED); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); (void)dns_name_downcase(owner, name, NULL); memset(buffer, 0, DNS_DS_BUFFERSIZE); diff --git a/lib/dns/journal.c b/lib/dns/journal.c index fd91f618aa9..09f665e6c8b 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -135,8 +135,7 @@ dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx, dns_fixedname_t fixed; dns_name_t *zonename; - dns_fixedname_init(&fixed); - zonename = dns_fixedname_name(&fixed); + zonename = dns_fixedname_initname(&fixed); dns_name_copy(dns_db_origin(db), zonename, NULL); node = NULL; diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c index ffac55e55f1..7d8cffbfcc2 100644 --- a/lib/dns/lookup.c +++ b/lib/dns/lookup.c @@ -199,8 +199,7 @@ lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) { send_event = ISC_TRUE; if (event == NULL && !lookup->canceled) { - dns_fixedname_init(&foundname); - fname = dns_fixedname_name(&foundname); + fname = dns_fixedname_initname(&foundname); INSIST(!dns_rdataset_isassociated(&lookup->rdataset)); INSIST(!dns_rdataset_isassociated (&lookup->sigrdataset)); @@ -296,8 +295,7 @@ lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) { /* * Construct the new query name and start over. */ - dns_fixedname_init(&fixed); - prefix = dns_fixedname_name(&fixed); + prefix = dns_fixedname_initname(&fixed); dns_name_split(name, nlabels, prefix, NULL); result = dns_name_concatenate(prefix, &dname.dname, name, NULL); diff --git a/lib/dns/master.c b/lib/dns/master.c index a49fa26c8e6..80068dfa835 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -598,8 +598,7 @@ loadctx_create(dns_masterformat_t format, isc_mem_t *mctx, lctx->include_arg = include_arg; isc_stdtime_get(&lctx->now); - dns_fixedname_init(&lctx->fixed_top); - lctx->top = dns_fixedname_name(&lctx->fixed_top); + lctx->top = dns_fixedname_initname(&lctx->fixed_top); dns_name_toregion(top, &r); dns_name_fromregion(lctx->top, &r); @@ -797,8 +796,7 @@ generate(dns_loadctx_t *lctx, char *range, char *lhs, char *gtype, char *rhs, ictx = lctx->inc; callbacks = lctx->callbacks; - dns_fixedname_init(&ownerfixed); - owner = dns_fixedname_name(&ownerfixed); + owner = dns_fixedname_initname(&ownerfixed); ISC_LIST_INIT(head); target_mem = isc_mem_get(lctx->mctx, target_size); @@ -1387,8 +1385,8 @@ load_text(dns_loadctx_t *lctx) { if (!ictx->in_use[new_in_use]) break; INSIST(new_in_use < NBUFS); - dns_fixedname_init(&ictx->fixed[new_in_use]); - new_name = dns_fixedname_name(&ictx->fixed[new_in_use]); + new_name = + dns_fixedname_initname(&ictx->fixed[new_in_use]); isc_buffer_init(&buffer, token.value.as_region.base, token.value.as_region.length); isc_buffer_add(&buffer, token.value.as_region.length); @@ -2333,8 +2331,7 @@ load_raw(dns_loadctx_t *lctx) { } isc_buffer_init(&target, target_mem, target_size); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); /* * In the following loop, we regard any error fatal regardless of diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index 28dad9061a8..e2eb61e1e9c 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -500,8 +500,7 @@ rdataset_totext(dns_rdataset_t *rdataset, current_ttl_valid = ctx->current_ttl_valid; if (owner_name != NULL) { - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); dns_name_copy(owner_name, name, NULL); dns_rdataset_getownercase(rdataset, name); } @@ -1649,8 +1648,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) { isc_buffer_init(&buffer, bufmem, initial_buffer_length); - dns_fixedname_init(&fixname); - name = dns_fixedname_name(&fixname); + name = dns_fixedname_initname(&fixname); if (dctx->first) { CHECK(writeheader(dctx)); diff --git a/lib/dns/name.c b/lib/dns/name.c index 7d7623b1b0b..e728d8072df 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -2462,8 +2462,7 @@ dns_name_fromstring2(dns_name_t *target, const char *src, if (BINDABLE(target) && target->buffer != NULL) name = target; else { - dns_fixedname_init(&fn); - name = dns_fixedname_name(&fn); + name = dns_fixedname_initname(&fn); } result = dns_name_fromtext(name, &buf, origin, options, NULL); diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c index f48c000fab5..3f4c87735df 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c @@ -236,8 +236,7 @@ dns_nsec3_hashname(dns_fixedname_t *result, memset(rethash, 0, NSEC3_MAX_HASH_LENGTH); - dns_fixedname_init(&fixed); - downcased = dns_fixedname_name(&fixed); + downcased = dns_fixedname_initname(&fixed); dns_name_downcase(name, downcased, NULL); /* hash the node name */ @@ -535,10 +534,8 @@ dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version, unsigned int old_length; unsigned int salt_length; - dns_fixedname_init(&fixed); - hashname = dns_fixedname_name(&fixed); - dns_fixedname_init(&fprev); - prev = dns_fixedname_name(&fprev); + hashname = dns_fixedname_initname(&fixed); + prev = dns_fixedname_initname(&fprev); dns_rdataset_init(&rdataset); @@ -1343,10 +1340,8 @@ dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, size_t next_length; unsigned int salt_length; - dns_fixedname_init(&fixed); - hashname = dns_fixedname_name(&fixed); - dns_fixedname_init(&fprev); - prev = dns_fixedname_name(&fprev); + hashname = dns_fixedname_initname(&fixed); + prev = dns_fixedname_initname(&fprev); dns_rdataset_init(&rdataset); @@ -1894,8 +1889,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, (*logit)(arg, ISC_LOG_DEBUG(3), "looking for relevant NSEC3"); - dns_fixedname_init(&fzone); - zone = dns_fixedname_name(&fzone); + zone = dns_fixedname_initname(&fzone); zlabels = dns_name_countlabels(nsec3name); /* @@ -1967,8 +1961,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, /* * Prepare to compute all the hashes. */ - dns_fixedname_init(&qfixed); - qname = dns_fixedname_name(&qfixed); + qname = dns_fixedname_initname(&qfixed); dns_name_downcase(name, qname, NULL); qlabels = dns_name_countlabels(qname); first = ISC_TRUE; diff --git a/lib/dns/nta.c b/lib/dns/nta.c index 383dc04c5ea..48810a4e152 100644 --- a/lib/dns/nta.c +++ b/lib/dns/nta.c @@ -331,8 +331,7 @@ nta_create(dns_ntatable_t *ntatable, const dns_name_t *name, return (result); } - dns_fixedname_init(&nta->fn); - nta->name = dns_fixedname_name(&nta->fn); + nta->name = dns_fixedname_initname(&nta->fn); dns_name_copy(name, nta->name, NULL); nta->magic = NTA_MAGIC; @@ -447,8 +446,7 @@ dns_ntatable_covered(dns_ntatable_t *ntatable, isc_stdtime_t now, if (ntatable == NULL) return (ISC_FALSE); - dns_fixedname_init(&fn); - foundname = dns_fixedname_name(&fn); + foundname = dns_fixedname_initname(&fn); relock: RWLOCK(&ntatable->rwlock, locktype); @@ -546,8 +544,7 @@ dns_ntatable_totext(dns_ntatable_t *ntatable, isc_buffer_t **buf) { dns_name_t *name; isc_time_t t; - dns_fixedname_init(&fn); - name = dns_fixedname_name(&fn); + name = dns_fixedname_initname(&fn); dns_rbt_fullnamefromnode(node, name); dns_name_format(name, nbuf, sizeof(nbuf)); isc_time_set(&t, n->expiry, 0); @@ -602,8 +599,7 @@ dns_ntatable_dump(dns_ntatable_t *ntatable, FILE *fp) { dns_name_t *name; isc_time_t t; - dns_fixedname_init(&fn); - name = dns_fixedname_name(&fn); + name = dns_fixedname_initname(&fn); dns_rbt_fullnamefromnode(node, name); dns_name_format(name, nbuf, sizeof(nbuf)); isc_time_set(&t, n->expiry, 0); @@ -682,8 +678,7 @@ dns_ntatable_save(dns_ntatable_t *ntatable, FILE *fp) { dns_fixedname_t fn; dns_name_t *name; - dns_fixedname_init(&fn); - name = dns_fixedname_name(&fn); + name = dns_fixedname_initname(&fn); dns_rbt_fullnamefromnode(node, name); isc_buffer_init(&b, nbuf, sizeof(nbuf)); diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index ebb9218c72f..f6551216f29 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -800,8 +800,7 @@ treefix(dns_rbt_t *rbt, void *base, size_t filesize, dns_rbtnode_t *n, CONFIRM(dns_name_isvalid(fullname)); if (!dns_name_isabsolute(&nodename)) { - dns_fixedname_init(&fixed); - fullname = dns_fixedname_name(&fixed); + fullname = dns_fixedname_initname(&fixed); CHECK(dns_name_concatenate(&nodename, name, fullname, NULL)); } @@ -1191,8 +1190,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, const dns_name_t *name, dns_rbtnode_t **nodep) { * Create a copy of the name so the original name structure is * not modified. */ - dns_fixedname_init(&fixedcopy); - add_name = dns_fixedname_name(&fixedcopy); + add_name = dns_fixedname_initname(&fixedcopy); dns_name_clone(name, add_name); if (ISC_UNLIKELY(rbt->root == NULL)) { @@ -1212,10 +1210,8 @@ dns_rbt_addnode(dns_rbt_t *rbt, const dns_name_t *name, dns_rbtnode_t **nodep) { level_count = 0; - dns_fixedname_init(&fixedprefix); - dns_fixedname_init(&fixedsuffix); - prefix = dns_fixedname_name(&fixedprefix); - suffix = dns_fixedname_name(&fixedsuffix); + prefix = dns_fixedname_initname(&fixedprefix); + suffix = dns_fixedname_initname(&fixedsuffix); root = &rbt->root; INSIST(IS_ROOT(*root)); @@ -1223,8 +1219,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, const dns_name_t *name, dns_rbtnode_t **nodep) { current = NULL; child = *root; dns_name_init(¤t_name, current_offsets); - dns_fixedname_init(&fnewname); - new_name = dns_fixedname_name(&fnewname); + new_name = dns_fixedname_initname(&fnewname); nlabels = dns_name_countlabels(name); hlabels = 0; @@ -1529,8 +1524,7 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, last_compared = NULL; order = 0; - dns_fixedname_init(&fixedcallbackname); - callback_name = dns_fixedname_name(&fixedcallbackname); + callback_name = dns_fixedname_initname(&fixedcallbackname); /* * search_name is the name segment being sought in each tree level. @@ -1539,8 +1533,7 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, * By using dns_name_clone, no name data should be copied thanks to * the lack of bitstring labels. */ - dns_fixedname_init(&fixedsearchname); - search_name = dns_fixedname_name(&fixedsearchname); + search_name = dns_fixedname_initname(&fixedsearchname); dns_name_clone(name, search_name); dns_name_init(¤t_name, NULL); @@ -2221,8 +2214,7 @@ dns_rbt_formatnodename(dns_rbtnode_t *node, char *printname, unsigned int size) REQUIRE(DNS_RBTNODE_VALID(node)); REQUIRE(printname != NULL); - dns_fixedname_init(&fixedname); - name = dns_fixedname_name(&fixedname); + name = dns_fixedname_initname(&fixedname); result = dns_rbt_fullnamefromnode(node, name); if (result == ISC_R_SUCCESS) dns_name_format(name, printname, size); diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 7aa5e43c1aa..9d40e86f2cd 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -1973,15 +1973,13 @@ delete_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) { * Though this may be wasteful, it has to be done before * node is deleted. */ - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); dns_rbt_fullnamefromnode(node, name); result = dns_rbt_deletenode(rbtdb->tree, node, ISC_FALSE); break; case DNS_RBT_NSEC_HAS_NSEC: - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); dns_rbt_fullnamefromnode(node, name); /* * Delete the corresponding node from the auxiliary NSEC @@ -3496,10 +3494,8 @@ activeempty(rbtdb_search_t *search, dns_rbtnodechain_t *chain, rbtdb = search->rbtdb; dns_name_init(&prefix, NULL); - dns_fixedname_init(&fnext); - next = dns_fixedname_name(&fnext); - dns_fixedname_init(&forigin); - origin = dns_fixedname_name(&forigin); + next = dns_fixedname_initname(&fnext); + origin = dns_fixedname_initname(&forigin); result = dns_rbtnodechain_next(chain, NULL, NULL); while (result == ISC_R_SUCCESS || result == DNS_R_NEWORIGIN) { @@ -3558,12 +3554,9 @@ activeemtpynode(rbtdb_search_t *search, const dns_name_t *qname, dns_name_init(&name, NULL); dns_name_init(&tname, NULL); dns_name_init(&rname, NULL); - dns_fixedname_init(&fnext); - next = dns_fixedname_name(&fnext); - dns_fixedname_init(&fprev); - prev = dns_fixedname_name(&fprev); - dns_fixedname_init(&forigin); - origin = dns_fixedname_name(&forigin); + next = dns_fixedname_initname(&fnext); + prev = dns_fixedname_initname(&fprev); + origin = dns_fixedname_initname(&forigin); /* * Find if qname is at or below a empty node. @@ -3717,8 +3710,7 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep, */ dns_name_init(&name, NULL); dns_rbt_namefromnode(node, &name); - dns_fixedname_init(&fwname); - wname = dns_fixedname_name(&fwname); + wname = dns_fixedname_initname(&fwname); result = dns_name_concatenate(dns_wildcardname, &name, wname, NULL); j = i; @@ -3872,8 +3864,7 @@ previous_closest_nsec(dns_rdatatype_t type, rbtdb_search_t *search, return (result); } - dns_fixedname_init(&ftarget); - target = dns_fixedname_name(&ftarget); + target = dns_fixedname_initname(&ftarget); for (;;) { if (*firstp) { @@ -3994,10 +3985,8 @@ find_closest_nsec(rbtdb_search_t *search, dns_dbnode_t **nodep, * Use the auxiliary tree only starting with the second node in the * hope that the original node will be right much of the time. */ - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); - dns_fixedname_init(&forigin); - origin = dns_fixedname_name(&forigin); + name = dns_fixedname_initname(&fname); + origin = dns_fixedname_initname(&forigin); again: node = NULL; prevnode = NULL; @@ -4976,10 +4965,8 @@ find_coveringnsec(rbtdb_search_t *search, dns_dbnode_t **nodep, do { node = NULL; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); - dns_fixedname_init(&forigin); - origin = dns_fixedname_name(&forigin); + name = dns_fixedname_initname(&fname); + origin = dns_fixedname_initname(&forigin); result = dns_rbtnodechain_current(&chain, name, origin, &node); if (result != ISC_R_SUCCESS) return (result); @@ -6838,8 +6825,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, if (result != ISC_R_SUCCESS) return (result); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); dns_rbt_fullnamefromnode(node, name); RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); @@ -10113,13 +10099,11 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { ctx = (rbtdb_glue_additionaldata_ctx_t *) arg; - dns_fixedname_init(&fixedname_a); - name_a = dns_fixedname_name(&fixedname_a); + name_a = dns_fixedname_initname(&fixedname_a); dns_rdataset_init(&rdataset_a); dns_rdataset_init(&sigrdataset_a); - dns_fixedname_init(&fixedname_aaaa); - name_aaaa = dns_fixedname_name(&fixedname_aaaa); + name_aaaa = dns_fixedname_initname(&fixedname_aaaa); dns_rdataset_init(&rdataset_aaaa); dns_rdataset_init(&sigrdataset_aaaa); @@ -10134,8 +10118,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { goto out; } - dns_fixedname_init(&glue->fixedname); - gluename = dns_fixedname_name(&glue->fixedname); + gluename = dns_fixedname_initname(&glue->fixedname); dns_name_copy(name_a, gluename, NULL); dns_rdataset_init(&glue->rdataset_a); @@ -10163,8 +10146,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { goto out; } - dns_fixedname_init(&glue->fixedname); - gluename = dns_fixedname_name(&glue->fixedname); + gluename = dns_fixedname_initname(&glue->fixedname); dns_name_copy(name_aaaa, gluename, NULL); dns_rdataset_init(&glue->rdataset_a); diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c index d2cb0f91f79..23e88710f2c 100644 --- a/lib/dns/rdataset.c +++ b/lib/dns/rdataset.c @@ -468,8 +468,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, i = 0; added = 0; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); dns_name_copy(owner_name, name, NULL); dns_rdataset_getownercase(rdataset, name); offset = 0xffff; diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 724219cde36..799a588b69f 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -1475,8 +1475,8 @@ fcount_incr(fetchctx_t *fctx, isc_boolean_t force) { counter->logged = 0; counter->allowed = 1; counter->dropped = 0; - dns_fixedname_init(&counter->fdname); - counter->domain = dns_fixedname_name(&counter->fdname); + counter->domain = + dns_fixedname_initname(&counter->fdname); dns_name_copy(&fctx->domain, counter->domain, NULL); ISC_LIST_APPEND(dbucket->list, counter, link); } @@ -3519,8 +3519,7 @@ fctx_getaddresses(fetchctx_t *fctx, isc_boolean_t badcache) { name = &suffix; } - dns_fixedname_init(&fixed); - domain = dns_fixedname_name(&fixed); + domain = dns_fixedname_initname(&fixed); result = dns_fwdtable_find(res->view->fwdtable, name, domain, &forwarders); if (result == ISC_R_SUCCESS) { @@ -4600,8 +4599,7 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, } /* Find the forwarder for this name. */ - dns_fixedname_init(&fixed); - fname = dns_fixedname_name(&fixed); + fname = dns_fixedname_initname(&fixed); result = dns_fwdtable_find(fctx->res->view->fwdtable, fwdname, fname, &forwarders); if (result == ISC_R_SUCCESS) @@ -5084,8 +5082,7 @@ validated(isc_task_t *task, isc_event_t *event) { * destroy the fctx if necessary. Save the wildcard name. */ if (vevent->proofs[DNS_VALIDATOR_NOQNAMEPROOF] != NULL) { - dns_fixedname_init(&fwild); - wild = dns_fixedname_name(&fwild); + wild = dns_fixedname_initname(&fwild); dns_name_copy(dns_fixedname_name(&vevent->validator->wild), wild, NULL); } @@ -5545,12 +5542,9 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, if (result != ISC_R_SUCCESS) return (result); - dns_fixedname_init(&fzonename); - zonename = dns_fixedname_name(&fzonename); - dns_fixedname_init(&fclosest); - closest = dns_fixedname_name(&fclosest); - dns_fixedname_init(&fnearest); - nearest = dns_fixedname_name(&fnearest); + zonename = dns_fixedname_initname(&fzonename); + closest = dns_fixedname_initname(&fclosest); + nearest = dns_fixedname_initname(&fnearest); #define NXND(x) ((x) == ISC_R_SUCCESS) @@ -6588,8 +6582,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, result = dns_rdata_tostruct(&rdata, &dname, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); dns_name_init(&prefix, NULL); - dns_fixedname_init(&fixed); - tname = dns_fixedname_name(&fixed); + tname = dns_fixedname_initname(&fixed); nlabels = dns_name_countlabels(qname) - dns_name_countlabels(rname); dns_name_split(qname, nlabels, &prefix, NULL); @@ -6820,8 +6813,7 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) { /* * Retrieve state from fctx->nsfetch before we destroy it. */ - dns_fixedname_init(&fixed); - domain = dns_fixedname_name(&fixed); + domain = dns_fixedname_initname(&fixed); dns_name_copy(&fctx->nsfetch->private->domain, domain, NULL); if (dns_name_equal(&fctx->nsname, domain)) { if (dns_rdataset_isassociated(fevent->rdataset)) { @@ -8983,8 +8975,7 @@ rctx_nextserver(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, dns_name_t *name, *fname; unsigned int findoptions = 0; - dns_fixedname_init(&foundname); - fname = dns_fixedname_name(&foundname); + fname = dns_fixedname_initname(&foundname); if (result != ISC_R_SUCCESS) { fctx_done(fctx, DNS_R_SERVFAIL, __LINE__); diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c index 15139938b27..5a7b624ff35 100644 --- a/lib/dns/rootns.c +++ b/lib/dns/rootns.c @@ -154,8 +154,7 @@ check_hints(dns_db_t *db) { isc_stdtime_get(&now); - dns_fixedname_init(&fixname); - name = dns_fixedname_name(&fixname); + name = dns_fixedname_initname(&fixname); dns_rdataset_init(&rootns); (void)dns_db_find(db, dns_rootname, NULL, dns_rdatatype_ns, 0, @@ -333,8 +332,7 @@ check_address_records(dns_view_t *view, dns_db_t *hints, dns_db_t *db, dns_rdataset_init(&hintrrset); dns_rdataset_init(&rootrrset); - dns_fixedname_init(&fixed); - foundname = dns_fixedname_name(&fixed); + foundname = dns_fixedname_initname(&fixed); hresult = dns_db_find(hints, name, NULL, dns_rdatatype_a, 0, now, NULL, foundname, &hintrrset, NULL); @@ -446,8 +444,7 @@ dns_root_checkhints(dns_view_t *view, dns_db_t *hints, dns_db_t *db) { dns_rdataset_init(&hintns); dns_rdataset_init(&rootns); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_db_find(hints, dns_rootname, NULL, dns_rdatatype_ns, 0, now, NULL, name, &hintns, NULL); diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c index 0560f5b242b..cc51fd0637b 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -177,8 +177,7 @@ catch_name(const dns_name_t *src_name, const char *tgt, const char *str) { dns_fixedname_t tgt_namef; dns_name_t *tgt_name; - dns_fixedname_init(&tgt_namef); - tgt_name = dns_fixedname_name(&tgt_namef); + tgt_name = dns_fixedname_initname(&tgt_namef); dns_name_fromstring(tgt_name, tgt, DNS_NAME_DOWNCASE, NULL); if (dns_name_equal(src_name, tgt_name)) { isc_log_write(dns_lctx, DNS_LOGCATEGORY_RPZ, @@ -953,8 +952,7 @@ name2ipkey(int log_level, * Convert the address back to a canonical domain name * to ensure that the original name is in canonical form. */ - dns_fixedname_init(&ip_name2f); - ip_name2 = dns_fixedname_name(&ip_name2f); + ip_name2 = dns_fixedname_initname(&ip_name2f); result = ip2name(tgt_ip, (dns_rpz_prefix_t)prefix_num, NULL, ip_name2); if (result != ISC_R_SUCCESS || @@ -1395,8 +1393,7 @@ add_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, * because wildcard triggers are handled differently. */ - dns_fixedname_init(&trig_namef); - trig_name = dns_fixedname_name(&trig_namef); + trig_name = dns_fixedname_initname(&trig_namef); name2data(rpzs, rpz_num, rpz_type, src_name, trig_name, &new_data); result = add_nm(rpzs, trig_name, &new_data); @@ -1777,8 +1774,7 @@ finish_update(dns_rpz_zone_t *rpz) { goto cleanup; } - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); for (result = isc_ht_iter_first(iter); result == ISC_R_SUCCESS; @@ -1846,8 +1842,7 @@ update_quantum(isc_task_t *task, isc_event_t *event) { REQUIRE(rpz->updbit != NULL); REQUIRE(rpz->newnodes != NULL); - dns_fixedname_init(&fixname); - name = dns_fixedname_name(&fixname); + name = dns_fixedname_initname(&fixname); dns_name_format(&rpz->origin, domain, DNS_NAME_FORMATSIZE); @@ -2324,8 +2319,7 @@ del_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, * because wildcard triggers are handled differently. */ - dns_fixedname_init(&trig_namef); - trig_name = dns_fixedname_name(&trig_namef); + trig_name = dns_fixedname_initname(&trig_namef); name2data(rpzs, rpz_num, rpz_type, src_name, trig_name, &del_data); nmnode = NULL; diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c index 21648e672d6..075644fa579 100644 --- a/lib/dns/sdb.c +++ b/lib/dns/sdb.c @@ -434,8 +434,7 @@ getnode(dns_sdballnodes_t *allnodes, const char *name, dns_sdbnode_t **nodep) { isc_buffer_t b; isc_result_t result; - dns_fixedname_init(&fnewname); - newname = dns_fixedname_name(&fnewname); + newname = dns_fixedname_initname(&fnewname); if ((imp->flags & DNS_SDBFLAG_RELATIVERDATA) != 0) origin = &sdb->common.origin; @@ -836,8 +835,7 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, olabels = dns_name_countlabels(&db->origin); nlabels = dns_name_countlabels(name); - dns_fixedname_init(&fname); - xname = dns_fixedname_name(&fname); + xname = dns_fixedname_initname(&fname); if (rdataset == NULL) { dns_rdataset_init(&xrdataset); diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c index f333c049969..1ae1ed01cf4 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -912,8 +912,7 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, olabels = dns_name_countlabels(&db->origin); nlabels = dns_name_countlabels(name); - dns_fixedname_init(&fname); - xname = dns_fixedname_name(&fname); + xname = dns_fixedname_initname(&fname); if (rdataset == NULL) { dns_rdataset_init(&xrdataset); @@ -1975,8 +1974,7 @@ dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name, isc_buffer_t b; isc_result_t result; - dns_fixedname_init(&fnewname); - newname = dns_fixedname_name(&fnewname); + newname = dns_fixedname_initname(&fnewname); if ((sdlz->dlzimp->flags & DNS_SDLZFLAG_RELATIVERDATA) != 0) origin = &sdlz->common.origin; diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c index 12894068dde..3f9cd74961a 100644 --- a/lib/dns/ssu.c +++ b/lib/dns/ssu.c @@ -450,8 +450,7 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, continue; break; case dns_ssumatchtype_selfwild: - dns_fixedname_init(&fixed); - wildcard = dns_fixedname_name(&fixed); + wildcard = dns_fixedname_initname(&fixed); result = dns_name_concatenate(dns_wildcardname, signer, wildcard, NULL); if (result != ISC_R_SUCCESS) @@ -484,8 +483,7 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, continue; break; case dns_ssumatchtype_tcpself: - dns_fixedname_init(&fixed); - tcpself = dns_fixedname_name(&fixed); + tcpself = dns_fixedname_initname(&fixed); reverse_from_address(tcpself, addr); if (dns_name_iswildcard(rule->identity)) { if (!dns_name_matcheswildcard(tcpself, @@ -499,8 +497,7 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, continue; break; case dns_ssumatchtype_6to4self: - dns_fixedname_init(&fixed); - stfself = dns_fixedname_name(&fixed); + stfself = dns_fixedname_initname(&fixed); stf_from_address(stfself, addr); if (dns_name_iswildcard(rule->identity)) { if (!dns_name_matcheswildcard(stfself, diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c index 1319682b087..bcaec371ebe 100644 --- a/lib/dns/tests/db_test.c +++ b/lib/dns/tests/db_test.c @@ -131,11 +131,8 @@ ATF_TC_BODY(dns_dbfind_staleok, tc) { dns_rdataclass_in, 0, NULL, &db); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - dns_fixedname_init(&example_fixed); - example = dns_fixedname_name(&example_fixed); - - dns_fixedname_init(&found_fixed); - found = dns_fixedname_name(&found_fixed); + example = dns_fixedname_initname(&example_fixed); + found = dns_fixedname_initname(&found_fixed); result = dns_name_fromstring(example, "example", 0, NULL); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); @@ -349,8 +346,7 @@ ATF_TC_BODY(version, tc) { dns_db_currentversion(db, &ver); dns_test_namefromstring("b.test.test", &fname); name = dns_fixedname_name(&fname); - dns_fixedname_init(&ffound); - foundname = dns_fixedname_name(&ffound); + foundname = dns_fixedname_initname(&ffound); dns_rdataset_init(&rdataset); result = dns_db_find(db, name , ver, dns_rdatatype_a, 0, 0, &node, foundname, &rdataset, NULL); @@ -363,8 +359,7 @@ ATF_TC_BODY(version, tc) { dns_db_currentversion(db, &ver); dns_test_namefromstring("b.test.test", &fname); name = dns_fixedname_name(&fname); - dns_fixedname_init(&ffound); - foundname = dns_fixedname_name(&ffound); + foundname = dns_fixedname_initname(&ffound); dns_rdataset_init(&rdataset); result = dns_db_find(db, name , ver, dns_rdatatype_a, 0, 0, &node, foundname, &rdataset, NULL); diff --git a/lib/dns/tests/dbiterator_test.c b/lib/dns/tests/dbiterator_test.c index f0bab60ce7c..7834a42b85b 100644 --- a/lib/dns/tests/dbiterator_test.c +++ b/lib/dns/tests/dbiterator_test.c @@ -99,8 +99,7 @@ test_walk(const atf_tc_t *tc) { UNUSED(tc); - dns_fixedname_init(&f); - name = dns_fixedname_name(&f); + name = dns_fixedname_initname(&f); result = dns_test_begin(NULL, ISC_FALSE); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); @@ -162,8 +161,7 @@ static void test_reverse(const atf_tc_t *tc) { UNUSED(tc); - dns_fixedname_init(&f); - name = dns_fixedname_name(&f); + name = dns_fixedname_initname(&f); result = dns_test_begin(NULL, ISC_FALSE); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); @@ -223,10 +221,8 @@ static void test_seek(const atf_tc_t *tc) { UNUSED(tc); - dns_fixedname_init(&f1); - name = dns_fixedname_name(&f1); - dns_fixedname_init(&f2); - seekname = dns_fixedname_name(&f2); + name = dns_fixedname_initname(&f1); + seekname = dns_fixedname_initname(&f2); result = dns_test_begin(NULL, ISC_FALSE); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); @@ -296,8 +292,7 @@ static void test_seek_empty(const atf_tc_t *tc) { UNUSED(tc); - dns_fixedname_init(&f1); - seekname = dns_fixedname_name(&f1); + seekname = dns_fixedname_initname(&f1); result = dns_test_begin(NULL, ISC_FALSE); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); @@ -353,8 +348,7 @@ static void test_seek_nx(const atf_tc_t *tc) { UNUSED(tc); - dns_fixedname_init(&f1); - seekname = dns_fixedname_name(&f1); + seekname = dns_fixedname_initname(&f1); result = dns_test_begin(NULL, ISC_FALSE); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); diff --git a/lib/dns/tests/dh_test.c b/lib/dns/tests/dh_test.c index 03929631142..b392a7e940c 100644 --- a/lib/dns/tests/dh_test.c +++ b/lib/dns/tests/dh_test.c @@ -50,8 +50,7 @@ ATF_TC_BODY(isc_dh_computesecret, tc) { ret = dns_test_begin(NULL, ISC_FALSE); ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); isc_buffer_constinit(&buf, "dh.", 3); isc_buffer_add(&buf, 3); ret = dns_name_fromtext(name, &buf, NULL, 0, NULL); diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c index c21a28aedc4..14892116c41 100644 --- a/lib/dns/tests/dnstap_test.c +++ b/lib/dns/tests/dnstap_test.c @@ -163,8 +163,7 @@ ATF_TC_BODY(send, tc) { /* * Set up some test data */ - dns_fixedname_init(&zfname); - zname = dns_fixedname_name(&zfname); + zname = dns_fixedname_initname(&zfname); isc_buffer_constinit(&zb, "example.com.", 12); isc_buffer_add(&zb, 12); result = dns_name_fromtext(zname, &zb, NULL, 0, NULL); diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c index b672b50f611..4fe5647aef7 100644 --- a/lib/dns/tests/dnstest.c +++ b/lib/dns/tests/dnstest.c @@ -232,8 +232,7 @@ dns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view, isc_buffer_constinit(&buffer, name, strlen(name)); isc_buffer_add(&buffer, strlen(name)); - dns_fixedname_init(&fixorigin); - origin = dns_fixedname_name(&fixorigin); + origin = dns_fixedname_initname(&fixorigin); CHECK(dns_name_fromtext(origin, &buffer, dns_rootname, 0, NULL)); CHECK(dns_zone_setorigin(zone, origin)); dns_zone_setview(zone, view); @@ -323,8 +322,7 @@ dns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, dns_fixedname_t fixed; dns_name_t *name; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_name_fromstring(name, origin, 0, NULL); if (result != ISC_R_SUCCESS) @@ -500,8 +498,7 @@ dns_test_namefromstring(const char *namestr, dns_fixedname_t *fname) { ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); isc_buffer_putmem(b, (const unsigned char *) namestr, length); - dns_fixedname_init(fname); - name = dns_fixedname_name(fname); + name = dns_fixedname_initname(fname); ATF_REQUIRE(name != NULL); result = dns_name_fromtext(name, b, dns_rootname, 0, NULL); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); diff --git a/lib/dns/tests/dst_test.c b/lib/dns/tests/dst_test.c index 397381bb60e..21ac69ecc1a 100644 --- a/lib/dns/tests/dst_test.c +++ b/lib/dns/tests/dst_test.c @@ -149,8 +149,7 @@ check_sig(const char *datapath, const char *sigpath, const char *keyname, /* * Read key from file in a form usable by dst_verify. */ - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); isc_buffer_constinit(&b, keyname, strlen(keyname)); isc_buffer_add(&b, strlen(keyname)); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); diff --git a/lib/dns/tests/keytable_test.c b/lib/dns/tests/keytable_test.c index b3929bc62be..b09eeca68c4 100644 --- a/lib/dns/tests/keytable_test.c +++ b/lib/dns/tests/keytable_test.c @@ -65,8 +65,7 @@ str2name(const char *namestr) { static isc_buffer_t namebuf; void *deconst_namestr; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); DE_CONST(namestr, deconst_namestr); /* OK, since we don't modify it */ isc_buffer_init(&namebuf, deconst_namestr, strlen(deconst_namestr)); isc_buffer_add(&namebuf, strlen(namestr)); @@ -478,8 +477,7 @@ ATF_TC_BODY(find, tc) { * dns_keytable_finddeepestmatch() allows partial match. Also match * nodes with a null key. */ - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); ATF_REQUIRE_EQ(dns_keytable_finddeepestmatch(keytable, str2name("example.com"), name), ISC_R_SUCCESS); diff --git a/lib/dns/tests/name_test.c b/lib/dns/tests/name_test.c index 77d4ab46d09..c1ca74012a8 100644 --- a/lib/dns/tests/name_test.c +++ b/lib/dns/tests/name_test.c @@ -84,10 +84,8 @@ ATF_TC_BODY(fullcompare, tc) { UNUSED(tc); - dns_fixedname_init(&fixed1); - name1 = dns_fixedname_name(&fixed1); - dns_fixedname_init(&fixed2); - name2 = dns_fixedname_name(&fixed2); + name1 = dns_fixedname_initname(&fixed1); + name2 = dns_fixedname_initname(&fixed2); for (i = 0; data[i].name1 != NULL; i++) { int order = 3000; unsigned int nlabels = 3000; @@ -315,8 +313,7 @@ ATF_TC_BODY(istat, tc) { { "_ta-1234-abcf-EcD89.example", ISC_FALSE } }; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); for (i = 0; i < sizeof(data)/sizeof(data[0]); i++) { result = dns_name_fromstring(name, data[i].name, 0, NULL); @@ -441,10 +438,8 @@ ATF_TC_BODY(hash, tc) { dns_name_t *n1, *n2; unsigned int h1, h2; - dns_fixedname_init(&f1); - n1 = dns_fixedname_name(&f1); - dns_fixedname_init(&f2); - n2 = dns_fixedname_name(&f2); + n1 = dns_fixedname_initname(&f1); + n2 = dns_fixedname_initname(&f2); result = dns_name_fromstring2(n1, testcases[i].name1, NULL, 0, NULL); @@ -498,10 +493,8 @@ ATF_TC_BODY(issubdomain, tc) { dns_fixedname_t f1, f2; dns_name_t *n1, *n2; - dns_fixedname_init(&f1); - n1 = dns_fixedname_name(&f1); - dns_fixedname_init(&f2); - n2 = dns_fixedname_name(&f2); + n1 = dns_fixedname_initname(&f1); + n2 = dns_fixedname_initname(&f2); result = dns_name_fromstring2(n1, testcases[i].name1, NULL, 0, NULL); @@ -543,8 +536,7 @@ ATF_TC_BODY(countlabels, tc) { dns_fixedname_t fname; dns_name_t *name; - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); result = dns_name_fromstring2(name, testcases[i].namestr, NULL, 0, NULL); @@ -583,10 +575,8 @@ ATF_TC_BODY(getlabel, tc) { unsigned char *p1, *p2; unsigned int j; - dns_fixedname_init(&f1); - n1 = dns_fixedname_name(&f1); - dns_fixedname_init(&f2); - n2 = dns_fixedname_name(&f2); + n1 = dns_fixedname_initname(&f1); + n2 = dns_fixedname_initname(&f2); result = dns_name_fromstring2(n1, testcases[i].name1, NULL, 0, NULL); @@ -637,10 +627,8 @@ ATF_TC_BODY(getlabelsequence, tc) { dns_name_init(&t2, NULL); /* source names */ - dns_fixedname_init(&f1); - n1 = dns_fixedname_name(&f1); - dns_fixedname_init(&f2); - n2 = dns_fixedname_name(&f2); + n1 = dns_fixedname_initname(&f1); + n2 = dns_fixedname_initname(&f2); result = dns_name_fromstring2(n1, testcases[i].name1, NULL, 0, NULL); diff --git a/lib/dns/tests/rbt_serialize_test.c b/lib/dns/tests/rbt_serialize_test.c index 337a558de86..2d34424b844 100644 --- a/lib/dns/tests/rbt_serialize_test.c +++ b/lib/dns/tests/rbt_serialize_test.c @@ -205,8 +205,7 @@ add_test_data(isc_mem_t *mymctx, dns_rbt_t *rbt) { isc_buffer_init(&b, buffer, testdatap->name_len); isc_buffer_add(&b, testdatap->name_len); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { testdatap++; @@ -239,8 +238,7 @@ check_test_data(dns_rbt_t *rbt) { dns_name_t *foundname; rbt_testdata_t *testdatap = testdata; - dns_fixedname_init(&fixed); - foundname = dns_fixedname_name(&fixed); + foundname = dns_fixedname_initname(&fixed); while (testdatap->name != NULL && testdatap->data.data != NULL) { memmove(buffer, testdatap->name, testdatap->name_len + 1); @@ -248,8 +246,7 @@ check_test_data(dns_rbt_t *rbt) { isc_buffer_init(&b, arg, testdatap->name_len); isc_buffer_add(&b, testdatap->name_len); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { testdatap++; diff --git a/lib/dns/tests/rbt_test.c b/lib/dns/tests/rbt_test.c index aa4c9a6708e..cfcf8f9614c 100644 --- a/lib/dns/tests/rbt_test.c +++ b/lib/dns/tests/rbt_test.c @@ -195,8 +195,7 @@ check_test_data(dns_rbt_t *rbt) { dns_name_t *foundname; size_t i; - dns_fixedname_init(&fixed); - foundname = dns_fixedname_name(&fixed); + foundname = dns_fixedname_initname(&fixed); for (i = 0; i < domain_names_count; i++) { dns_fixedname_t fname; @@ -1087,8 +1086,7 @@ ATF_TC_BODY(rbt_findname, tc) { dns_test_namefromstring("d.e.f", &fname); name = dns_fixedname_name(&fname); - dns_fixedname_init(&found); - foundname = dns_fixedname_name(&found); + foundname = dns_fixedname_initname(&found); result = dns_rbt_findname(ctx->rbt, name, DNS_RBTFIND_EMPTYDATA, @@ -1233,8 +1231,7 @@ ATF_TC_BODY(rbt_nodechain, tc) { &node, &chain, 0, NULL, NULL); ATF_CHECK_EQ(result, ISC_R_SUCCESS); - dns_fixedname_init(&found); - foundname = dns_fixedname_name(&found); + foundname = dns_fixedname_initname(&found); dns_test_namefromstring("a", &expect); expected = dns_fixedname_name(&expect); diff --git a/lib/dns/tests/rsa_test.c b/lib/dns/tests/rsa_test.c index fb9a035460d..65ecd1212d8 100644 --- a/lib/dns/tests/rsa_test.c +++ b/lib/dns/tests/rsa_test.c @@ -195,8 +195,7 @@ ATF_TC_BODY(isc_rsa_verify, tc) { ret = dns_test_begin(NULL, ISC_FALSE); ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); isc_buffer_constinit(&buf, "rsa.", 4); isc_buffer_add(&buf, 4); ret = dns_name_fromtext(name, &buf, NULL, 0, NULL); diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c index 7ac73676df5..b99c0e55cd9 100644 --- a/lib/dns/tests/tsig_test.c +++ b/lib/dns/tests/tsig_test.c @@ -283,8 +283,7 @@ ATF_TC_BODY(tsig_tcp, tc) { /* isc_log_setdebuglevel(lctx, 99); */ - dns_fixedname_init(&fkeyname); - keyname = dns_fixedname_name(&fkeyname); + keyname = dns_fixedname_initname(&fkeyname); result = dns_name_fromstring(keyname, "test", 0, NULL); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c index 598bd6218e8..3b553287c52 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -503,8 +503,7 @@ process_gsstkey(dns_name_t *name, dns_rdata_tkey_t *tkeyin, if (result == ISC_R_SUCCESS) gss_ctx = dst_key_getgssctx(tsigkey->key); - dns_fixedname_init(&fixed); - principal = dns_fixedname_name(&fixed); + principal = dns_fixedname_initname(&fixed); /* * Note that tctx->gsscred may be NULL if tctx->gssapi_keytab is set @@ -761,8 +760,7 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx, goto failure; } - dns_fixedname_init(&fkeyname); - keyname = dns_fixedname_name(&fkeyname); + keyname = dns_fixedname_initname(&fkeyname); if (!dns_name_equal(qname, dns_rootname)) { unsigned int n = dns_name_countlabels(qname); diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index 758b81dc547..96a6d53bc38 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -421,8 +421,7 @@ cleanup_ring(dns_tsig_keyring_t *ring) */ isc_stdtime_get(&now); dns_name_init(&foundname, NULL); - dns_fixedname_init(&fixedorigin); - origin = dns_fixedname_name(&fixedorigin); + origin = dns_fixedname_initname(&fixedorigin); again: dns_rbtnodechain_init(&chain, ring->mctx); @@ -544,24 +543,21 @@ restore_key(dns_tsig_keyring_t *ring, isc_stdtime_t now, FILE *fp) { if (isc_serial_lt(expire, now)) return (DNS_R_EXPIRED); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); isc_buffer_init(&b, namestr, strlen(namestr)); isc_buffer_add(&b, strlen(namestr)); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) return (result); - dns_fixedname_init(&fcreator); - creator = dns_fixedname_name(&fcreator); + creator = dns_fixedname_initname(&fcreator); isc_buffer_init(&b, creatorstr, strlen(creatorstr)); isc_buffer_add(&b, strlen(creatorstr)); result = dns_name_fromtext(creator, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) return (result); - dns_fixedname_init(&falgorithm); - algorithm = dns_fixedname_name(&falgorithm); + algorithm = dns_fixedname_initname(&falgorithm); isc_buffer_init(&b, algorithmstr, strlen(algorithmstr)); isc_buffer_add(&b, strlen(algorithmstr)); result = dns_name_fromtext(algorithm, &b, dns_rootname, 0, NULL); @@ -639,8 +635,7 @@ dns_tsigkeyring_dumpanddetach(dns_tsig_keyring_t **ringp, FILE *fp) { isc_stdtime_get(&now); dns_name_init(&foundname, NULL); - dns_fixedname_init(&fixedorigin); - origin = dns_fixedname_name(&fixedorigin); + origin = dns_fixedname_initname(&fixedorigin); dns_rbtnodechain_init(&chain, ring->mctx); result = dns_rbtnodechain_first(&chain, ring->keys, &foundname, origin); diff --git a/lib/dns/update.c b/lib/dns/update.c index 5cfa0434e67..b2934e2f91c 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -740,8 +740,7 @@ namelist_append_subdomain(dns_db_t *db, dns_name_t *name, dns_diff_t *affected) dns_name_t *child; dns_dbiterator_t *dbit = NULL; - dns_fixedname_init(&fixedname); - child = dns_fixedname_name(&fixedname); + child = dns_fixedname_initname(&fixedname); CHECK(dns_db_createiterator(db, DNS_DB_NONSEC3, &dbit)); @@ -945,8 +944,7 @@ next_active(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, } else { dns_fixedname_t ffound; dns_name_t *found; - dns_fixedname_init(&ffound); - found = dns_fixedname_name(&ffound); + found = dns_fixedname_initname(&ffound); result = dns_db_find(db, newname, ver, dns_rdatatype_soa, DNS_DBFIND_NOWILD, 0, NULL, found, @@ -987,8 +985,7 @@ add_nsec(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_fixedname_t fixedname; dns_name_t *target; - dns_fixedname_init(&fixedname); - target = dns_fixedname_name(&fixedname); + target = dns_fixedname_initname(&fixedname); /* * Find the successor name, aka NSEC target. @@ -1600,8 +1597,7 @@ dns_update_signaturesinc(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_fixedname_t fixedname; dns_name_t *prevname; - dns_fixedname_init(&fixedname); - prevname = dns_fixedname_name(&fixedname); + prevname = dns_fixedname_initname(&fixedname); if (oldver != NULL) CHECK(name_exists(db, oldver, &t->name, diff --git a/lib/dns/validator.c b/lib/dns/validator.c index c43cf756183..a13a99f9e81 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -994,8 +994,7 @@ view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) { options = DNS_DBFIND_PENDINGOK; if (type == dns_rdatatype_dlv) options |= DNS_DBFIND_COVERINGNSEC; - dns_fixedname_init(&fixedname); - foundname = dns_fixedname_name(&fixedname); + foundname = dns_fixedname_initname(&fixedname); result = dns_view_find(val->view, name, type, 0, options, ISC_FALSE, ISC_FALSE, NULL, NULL, foundname, &val->frdataset, &val->fsigrdataset); @@ -1506,8 +1505,7 @@ verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata, dns_name_t *wild; val->attributes |= VALATTR_TRIEDVERIFY; - dns_fixedname_init(&fixed); - wild = dns_fixedname_name(&fixed); + wild = dns_fixedname_initname(&fixed); again: result = dns_dnssec_verify(val->event->name, val->event->rdataset, key, ignore, val->view->maxbits, @@ -1982,8 +1980,7 @@ validatezonekey(dns_validator_t *val) { dns_fixedname_t fixed; dns_name_t *found; - dns_fixedname_init(&fixed); - found = dns_fixedname_name(&fixed); + found = dns_fixedname_initname(&fixed); dns_rdata_reset(&sigrdata); dns_rdataset_current(val->event->sigrdataset, &sigrdata); @@ -2493,12 +2490,9 @@ findnsec3proofs(dns_validator_t *val) { dns_name_init(&tname, NULL); dns_rdataset_init(&trdataset); - dns_fixedname_init(&fclosest); - dns_fixedname_init(&fnearest); - dns_fixedname_init(&fzonename); - closest = dns_fixedname_name(&fclosest); - nearest = dns_fixedname_name(&fnearest); - zonename = dns_fixedname_name(&fzonename); + closest = dns_fixedname_initname(&fclosest); + nearest = dns_fixedname_initname(&fnearest); + zonename = dns_fixedname_initname(&fzonename); if (val->event->message == NULL) { name = &tname; @@ -2738,8 +2732,7 @@ validate_ncache(dns_validator_t *val, isc_boolean_t resume) { if (dns_rdataset_isassociated(&val->fsigrdataset)) dns_rdataset_disassociate(&val->fsigrdataset); - dns_fixedname_init(&val->fname); - name = dns_fixedname_name(&val->fname); + name = dns_fixedname_initname(&val->fname); rdataset = &val->frdataset; dns_ncache_current(val->event->rdataset, name, rdataset); @@ -3149,8 +3142,7 @@ finddlvsep(dns_validator_t *val, isc_boolean_t resume) { return (DNS_R_MUSTBESECURE); } - dns_fixedname_init(&val->dlvsep); - dlvsep = dns_fixedname_name(&val->dlvsep); + dlvsep = dns_fixedname_initname(&val->dlvsep); dns_name_copy(val->event->name, dlvsep, NULL); /* * If this is a response to a DS query, we need to look in @@ -3169,8 +3161,7 @@ finddlvsep(dns_validator_t *val, isc_boolean_t resume) { dns_name_getlabelsequence(dlvsep, 1, labels - 1, dlvsep); } dns_name_init(&noroot, NULL); - dns_fixedname_init(&dlvfixed); - dlvname = dns_fixedname_name(&dlvfixed); + dlvname = dns_fixedname_initname(&dlvfixed); labels = dns_name_countlabels(dlvsep); if (labels == 0) return (ISC_R_NOTFOUND); @@ -3283,10 +3274,8 @@ proveunsecure(dns_validator_t *val, isc_boolean_t have_ds, isc_boolean_t resume) dns_name_t *found; dns_fixedname_t fixedfound; - dns_fixedname_init(&fixedsecroot); - secroot = dns_fixedname_name(&fixedsecroot); - dns_fixedname_init(&fixedfound); - found = dns_fixedname_name(&fixedfound); + secroot = dns_fixedname_initname(&fixedsecroot); + found = dns_fixedname_initname(&fixedfound); if (val->havedlvsep) dns_name_copy(dns_fixedname_name(&val->dlvsep), secroot, NULL); else { @@ -3368,8 +3357,7 @@ proveunsecure(dns_validator_t *val, isc_boolean_t have_ds, isc_boolean_t resume) val->labels++) { - dns_fixedname_init(&val->fname); - tname = dns_fixedname_name(&val->fname); + tname = dns_fixedname_initname(&val->fname); if (val->labels == dns_name_countlabels(val->event->name)) dns_name_copy(val->event->name, tname, NULL); else diff --git a/lib/dns/view.c b/lib/dns/view.c index f5409cbbab0..f3f79f16793 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -1898,8 +1898,7 @@ dns_view_issecuredomain(dns_view_t *view, const dns_name_t *name, if (view->secroots_priv == NULL) return (ISC_R_NOTFOUND); - dns_fixedname_init(&fn); - anchor = dns_fixedname_name(&fn); + anchor = dns_fixedname_initname(&fn); result = dns_keytable_issecuredomain(view->secroots_priv, name, anchor, &secure); @@ -2182,8 +2181,7 @@ dns_view_searchdlz(dns_view_t *view, const dns_name_t *name, REQUIRE(dbp != NULL && *dbp == NULL); /* setup a "fixed" dns name */ - dns_fixedname_init(&fname); - zonename = dns_fixedname_name(&fname); + zonename = dns_fixedname_initname(&fname); /* count the number of labels in the name */ namelabels = dns_name_countlabels(name); @@ -2348,8 +2346,7 @@ dns_view_loadnta(dns_view_t *view) { ntaname = dns_rootname; else { dns_name_t *fname; - dns_fixedname_init(&fn); - fname = dns_fixedname_name(&fn); + fname = dns_fixedname_initname(&fn); isc_buffer_init(&b, name, (unsigned int)len); isc_buffer_add(&b, (unsigned int)len); diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 000e0bbbf6a..4ba32d58015 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -2552,8 +2552,7 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, else level = ISC_LOG_WARNING; - dns_fixedname_init(&fixed); - foundname = dns_fixedname_name(&fixed); + foundname = dns_fixedname_initname(&fixed); result = dns_db_find(db, name, NULL, dns_rdatatype_a, 0, 0, NULL, foundname, NULL, NULL); @@ -2641,8 +2640,7 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, else level = ISC_LOG_WARNING; - dns_fixedname_init(&fixed); - foundname = dns_fixedname_name(&fixed); + foundname = dns_fixedname_initname(&fixed); result = dns_db_find(db, name, NULL, dns_rdatatype_a, 0, 0, NULL, foundname, NULL, NULL); @@ -2726,8 +2724,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, else level = ISC_LOG_WARNING; - dns_fixedname_init(&fixed); - foundname = dns_fixedname_name(&fixed); + foundname = dns_fixedname_initname(&fixed); dns_rdataset_init(&a); dns_rdataset_init(&aaaa); @@ -2901,8 +2898,7 @@ zone_check_dup(dns_zone_t *zone, dns_db_t *db) { isc_boolean_t ok = ISC_TRUE; isc_result_t result; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); dns_rdataset_init(&rdataset); result = dns_db_createiterator(db, 0, &dbiterator); @@ -2983,10 +2979,8 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) { isc_result_t result; isc_boolean_t ok = ISC_TRUE, have_spf, have_txt; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); - dns_fixedname_init(&fixedbottom); - bottom = dns_fixedname_name(&fixedbottom); + name = dns_fixedname_initname(&fixed); + bottom = dns_fixedname_initname(&fixedbottom); dns_rdataset_init(&rdataset); dns_rdata_init(&rdata); @@ -4798,8 +4792,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, dns_rdataset_t next; dns_rdataset_init(&next); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_db_getsigningtime(db, &next, name); if (result == ISC_R_SUCCESS) { @@ -4941,8 +4934,7 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, else level = ISC_LOG_WARNING; - dns_fixedname_init(&fixed); - foundname = dns_fixedname_name(&fixed); + foundname = dns_fixedname_initname(&fixed); result = dns_db_find(db, name, version, dns_rdatatype_a, 0, 0, NULL, foundname, NULL, NULL); @@ -6424,7 +6416,6 @@ zone_resigninc(dns_zone_t *zone) { ENTER; dns_rdataset_init(&rdataset); - dns_fixedname_init(&fixed); dns_diff_init(zone->mctx, &_sig_diff); zonediff_init(&zonediff, &_sig_diff); @@ -6476,7 +6467,7 @@ zone_resigninc(dns_zone_t *zone) { check_ksk = DNS_ZONE_OPTION(zone, DNS_ZONEOPT_UPDATECHECKKSK); keyset_kskonly = DNS_ZONE_OPTION(zone, DNS_ZONEOPT_DNSKEYKSKONLY); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_db_getsigningtime(db, &rdataset, name); if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) { dns_zone_log(zone, ISC_LOG_ERROR, @@ -6693,8 +6684,7 @@ add_nsec(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, isc_result_t result; unsigned char nsecbuffer[DNS_NSEC_BUFFERSIZE]; - dns_fixedname_init(&fixed); - next = dns_fixedname_name(&fixed); + next = dns_fixedname_initname(&fixed); CHECK(next_active(db, version, name, next, bottom)); CHECK(dns_nsec_buildrdata(db, version, node, next, nsecbuffer, @@ -7384,10 +7374,8 @@ zone_nsec3chain(dns_zone_t *zone) { ENTER; dns_rdataset_init(&rdataset); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); - dns_fixedname_init(&nextfixed); - nextname = dns_fixedname_name(&nextfixed); + name = dns_fixedname_initname(&fixed); + nextname = dns_fixedname_initname(&nextfixed); dns_diff_init(zone->mctx, ¶m_diff); dns_diff_init(zone->mctx, &nsec3_diff); dns_diff_init(zone->mctx, &nsec_diff); @@ -7531,8 +7519,7 @@ zone_nsec3chain(dns_zone_t *zone) { if (first) { dns_fixedname_t ffound; dns_name_t *found; - dns_fixedname_init(&ffound); - found = dns_fixedname_name(&ffound); + found = dns_fixedname_initname(&ffound); result = dns_db_find(db, name, version, dns_rdatatype_soa, DNS_DBFIND_NOWILD, 0, NULL, found, @@ -7780,8 +7767,7 @@ zone_nsec3chain(dns_zone_t *zone) { if (first) { dns_fixedname_t ffound; dns_name_t *found; - dns_fixedname_init(&ffound); - found = dns_fixedname_name(&ffound); + found = dns_fixedname_initname(&ffound); result = dns_db_find(db, name, version, dns_rdatatype_soa, DNS_DBFIND_NOWILD, 0, NULL, found, @@ -8280,10 +8266,8 @@ zone_sign(dns_zone_t *zone) { ENTER; dns_rdataset_init(&rdataset); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); - dns_fixedname_init(&nextfixed); - nextname = dns_fixedname_name(&nextfixed); + name = dns_fixedname_initname(&fixed); + nextname = dns_fixedname_initname(&nextfixed); dns_diff_init(zone->mctx, &_sig_diff); dns_diff_init(zone->mctx, &post_diff); zonediff_init(&zonediff, &_sig_diff); @@ -8416,8 +8400,7 @@ zone_sign(dns_zone_t *zone) { if (first) { dns_fixedname_t ffound; dns_name_t *found; - dns_fixedname_init(&ffound); - found = dns_fixedname_name(&ffound); + found = dns_fixedname_initname(&ffound); result = dns_db_find(db, name, version, dns_rdatatype_soa, DNS_DBFIND_NOWILD, 0, NULL, found, @@ -9708,8 +9691,7 @@ zone_refreshkeys(dns_zone_t *zone) { kfetch->zone = zone; zone->irefs++; INSIST(zone->irefs != 0); - dns_fixedname_init(&kfetch->name); - kname = dns_fixedname_name(&kfetch->name); + kname = dns_fixedname_initname(&kfetch->name); dns_name_dup(name, zone->mctx, kname); dns_rdataset_init(&kfetch->dnskeyset); dns_rdataset_init(&kfetch->dnskeysigset); @@ -14371,8 +14353,7 @@ checkandaddsoa(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, result = dns_rdatalist_tordataset(&temprdatalist, &temprdataset); RUNTIME_CHECK(result == ISC_R_SUCCESS); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_db_nodefullname(db, node, name); RUNTIME_CHECK(result == ISC_R_SUCCESS); dns_rdataset_getownercase(rdataset, name); @@ -14608,8 +14589,7 @@ receive_secure_db(isc_task_t *task, isc_event_t *event) { rawdb = ((struct secure_event *)event)->db; isc_event_free(&event); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); dns_rdataset_init(&rdataset); LOCK_ZONE(zone); diff --git a/lib/irs/dnsconf.c b/lib/irs/dnsconf.c index 182f4aa9a4e..2111237603f 100644 --- a/lib/irs/dnsconf.c +++ b/lib/irs/dnsconf.c @@ -137,8 +137,7 @@ configure_dnsseckeys(irs_dnsconf_t *conf, cfg_obj_t *cfgobj, goto cleanup; /* Configure key name */ - dns_fixedname_init(&fkeyname); - keyname_base = dns_fixedname_name(&fkeyname); + keyname_base = dns_fixedname_initname(&fkeyname); isc_buffer_constinit(&namebuf, keynamestr, strlen(keynamestr)); isc_buffer_add(&namebuf, strlen(keynamestr)); diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c index b214599d070..74fd80f75d6 100644 --- a/lib/irs/getaddrinfo.c +++ b/lib/irs/getaddrinfo.c @@ -553,8 +553,7 @@ make_resstate(isc_mem_t *mctx, gai_statehead_t *head, const char *hostname, namelen = strlen(domain); isc_buffer_constinit(&b, domain, namelen); isc_buffer_add(&b, namelen); - dns_fixedname_init(&fixeddomain); - qdomain = dns_fixedname_name(&fixeddomain); + qdomain = dns_fixedname_initname(&fixeddomain); result = dns_name_fromtext(qdomain, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { isc_mem_put(mctx, state, sizeof(*state)); @@ -565,8 +564,7 @@ make_resstate(isc_mem_t *mctx, gai_statehead_t *head, const char *hostname, namelen = strlen(hostname); isc_buffer_constinit(&b, hostname, namelen); isc_buffer_add(&b, namelen); - dns_fixedname_init(&state->fixedname); - state->qname = dns_fixedname_name(&state->fixedname); + state->qname = dns_fixedname_initname(&state->fixedname); result = dns_name_fromtext(state->qname, &b, qdomain, 0, NULL); if (result != ISC_R_SUCCESS) { isc_mem_put(mctx, state, sizeof(*state)); diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c index e3340af926c..475a241dfd2 100644 --- a/lib/irs/getnameinfo.c +++ b/lib/irs/getnameinfo.c @@ -290,8 +290,7 @@ getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen, /* Make query name */ isc_netaddr_fromsockaddr(&netaddr, (const isc_sockaddr_t *)sa); - dns_fixedname_init(&ptrfname); - ptrname = dns_fixedname_name(&ptrfname); + ptrname = dns_fixedname_initname(&ptrfname); iresult = dns_byaddr_createptrname(&netaddr, 0, ptrname); if (iresult != ISC_R_SUCCESS) ERR(EAI_FAIL); diff --git a/lib/ns/query.c b/lib/ns/query.c index 0ecd1db1bff..b352cdbf552 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -945,9 +945,8 @@ ns_query_init(ns_client_t *client) { client->query.redirect.sigrdataset = NULL; client->query.redirect.authoritative = ISC_FALSE; client->query.redirect.is_zone = ISC_FALSE; - dns_fixedname_init(&client->query.redirect.fixed); client->query.redirect.fname = - dns_fixedname_name(&client->query.redirect.fixed); + dns_fixedname_initname(&client->query.redirect.fixed); query_reset(client, ISC_FALSE); result = query_newdbversion(client, 3); if (result != ISC_R_SUCCESS) { @@ -2735,8 +2734,7 @@ rpz_rrset_find(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type, } node = NULL; - dns_fixedname_init(&fixed); - found = dns_fixedname_name(&fixed); + found = dns_fixedname_initname(&fixed); dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfo_init(&ci, client, NULL); result = dns_db_findext(*dbp, name, version, type, DNS_DBFIND_GLUEOK, @@ -2900,8 +2898,7 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, result = rpz_getdb(client, p_name, rpz_type, zonep, dbp, versionp); if (result != ISC_R_SUCCESS) return (DNS_R_NXDOMAIN); - dns_fixedname_init(&foundf); - found = dns_fixedname_name(&foundf); + found = dns_fixedname_initname(&foundf); result = dns_db_findext(*dbp, p_name, *versionp, dns_rdatatype_any, 0, client->now, nodep, found, &cm, &ci, @@ -3172,8 +3169,7 @@ dnsrps_set_p(librpz_emsg_t *emsg, ns_client_t *client, dns_rpz_st_t *st, /* * Get the DNSPRS imitation rdataset. */ - dns_fixedname_init(&foundf); - found = dns_fixedname_name(&foundf); + found = dns_fixedname_initname(&foundf); result = dns_db_find(p_db, st->p_name, NULL, searchtype, 0, 0, &p_node, found, *p_rdatasetp, NULL); @@ -3343,8 +3339,7 @@ rpz_rewrite_ip(ns_client_t *client, const isc_netaddr_t *netaddr, } #endif - dns_fixedname_init(&ip_namef); - ip_name = dns_fixedname_name(&ip_namef); + ip_name = dns_fixedname_initname(&ip_namef); p_zone = NULL; p_db = NULL; @@ -3377,8 +3372,7 @@ rpz_rewrite_ip(ns_client_t *client, const isc_netaddr_t *netaddr, * Get the policy for a prefix at least as long * as the prefix of the entry we had before. */ - dns_fixedname_init(&p_namef); - p_name = dns_fixedname_name(&p_namef); + p_name = dns_fixedname_initname(&p_namef); result = rpz_get_p_name(client, p_name, rpz, rpz_type, ip_name); if (result != ISC_R_SUCCESS) continue; @@ -3667,8 +3661,7 @@ rpz_rewrite_name(ns_client_t *client, dns_name_t *trig_name, if (zbits == 0) return (ISC_R_SUCCESS); - dns_fixedname_init(&p_namef); - p_name = dns_fixedname_name(&p_namef); + p_name = dns_fixedname_initname(&p_namef); p_zone = NULL; p_db = NULL; @@ -3897,12 +3890,9 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, st->m.ttl = ~0; memset(&st->r, 0, sizeof(st->r)); memset(&st->q, 0, sizeof(st->q)); - dns_fixedname_init(&st->_p_namef); - dns_fixedname_init(&st->_r_namef); - dns_fixedname_init(&st->_fnamef); - st->p_name = dns_fixedname_name(&st->_p_namef); - st->r_name = dns_fixedname_name(&st->_r_namef); - st->fname = dns_fixedname_name(&st->_fnamef); + st->p_name = dns_fixedname_initname(&st->_p_namef); + st->r_name = dns_fixedname_initname(&st->_r_namef); + st->fname = dns_fixedname_initname(&st->_fnamef); st->have = have; st->popt = popt; st->rpz_ver = rpz_ver; @@ -4320,8 +4310,7 @@ rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, */ if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) == 0) return (ISC_TRUE); - dns_fixedname_init(&fixed); - found = dns_fixedname_name(&fixed); + found = dns_fixedname_initname(&fixed); dns_rdataset_init(&trdataset); for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; @@ -4695,8 +4684,7 @@ redirect(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, if (client->view->redirect == NULL) return (ISC_R_NOTFOUND); - dns_fixedname_init(&fixed); - found = dns_fixedname_name(&fixed); + found = dns_fixedname_initname(&fixed); dns_rdataset_init(&trdataset); dns_clientinfomethods_init(&cm, ns_client_sourceip); @@ -4816,8 +4804,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, if (dns_name_issubdomain(name, client->view->redirectzone)) return (ISC_R_NOTFOUND); - dns_fixedname_init(&fixed); - found = dns_fixedname_name(&fixed); + found = dns_fixedname_initname(&fixed); dns_rdataset_init(&trdataset); dns_clientinfomethods_init(&cm, ns_client_sourceip); @@ -4848,8 +4835,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, } } - dns_fixedname_init(&fixedredirect); - redirectname = dns_fixedname_name(&fixedredirect); + redirectname = dns_fixedname_initname(&fixedredirect); if (dns_name_countlabels(name) > 1U) { dns_name_t prefix; unsigned int labels = dns_name_countlabels(name) - 1; @@ -8033,8 +8019,7 @@ query_sign_nodata(query_ctx_t *qctx) { dns_fixedname_t fixed; isc_buffer_t b; - dns_fixedname_init(&fixed); - found = dns_fixedname_name(&fixed); + found = dns_fixedname_initname(&fixed); qname = qctx->client->query.qname; query_findclosestnsec3(qname, qctx->db, qctx->version, @@ -8826,14 +8811,10 @@ query_coveringnsec(query_ctx_t *qctx) { goto cleanup; } - dns_fixedname_init(&fwild); - wild = dns_fixedname_name(&fwild); - dns_fixedname_init(&fixed); - fname = dns_fixedname_name(&fixed); - dns_fixedname_init(&fsigner); - signer = dns_fixedname_name(&fsigner); - dns_fixedname_init(&fnowild); - nowild = dns_fixedname_name(&fnowild); + wild = dns_fixedname_initname(&fwild); + fname = dns_fixedname_initname(&fixed); + signer = dns_fixedname_initname(&fsigner); + nowild = dns_fixedname_initname(&fnowild); dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfo_init(&ci, qctx->client, NULL); @@ -9328,8 +9309,7 @@ query_dname(query_ctx_t *qctx) { * Construct the new qname consisting of * . */ - dns_fixedname_init(&fixed); - prefix = dns_fixedname_name(&fixed); + prefix = dns_fixedname_initname(&fixed); dns_name_split(qctx->client->query.qname, nlabels, prefix, NULL); INSIST(qctx->fname == NULL); qctx->dbuf = query_getnamebuf(qctx->client); @@ -9583,8 +9563,7 @@ query_addsoa(query_ctx_t *qctx, unsigned int override_ttl, dns_fixedname_t foundname; dns_name_t *fname; - dns_fixedname_init(&foundname); - fname = dns_fixedname_name(&foundname); + fname = dns_fixedname_initname(&foundname); result = dns_db_findext(qctx->db, name, qctx->version, dns_rdatatype_soa, @@ -9673,8 +9652,7 @@ query_addns(query_ctx_t *qctx) { * Initialization. */ eresult = ISC_R_SUCCESS; - dns_fixedname_init(&foundname); - fname = dns_fixedname_name(&foundname); + fname = dns_fixedname_initname(&foundname); dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfo_init(&ci, client, NULL); @@ -10043,8 +10021,7 @@ query_addwildcardproof(query_ctx_t *qctx, isc_boolean_t ispositive, * wild *.example */ options = client->query.dboptions | DNS_DBFIND_NOWILD; - dns_fixedname_init(&wfixed); - wname = dns_fixedname_name(&wfixed); + wname = dns_fixedname_initname(&wfixed); again: have_wname = ISC_FALSE; /* @@ -10069,8 +10046,7 @@ query_addwildcardproof(query_ctx_t *qctx, isc_boolean_t ispositive, /* * No NSEC proof available, return NSEC3 proofs instead. */ - dns_fixedname_init(&cfixed); - cname = dns_fixedname_name(&cfixed); + cname = dns_fixedname_initname(&cfixed); /* * Find the closest encloser. */ diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c index d95f5aa2b0f..9e3fcb40b76 100644 --- a/lib/ns/tests/nstest.c +++ b/lib/ns/tests/nstest.c @@ -374,8 +374,7 @@ ns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view, isc_buffer_constinit(&buffer, name, strlen(name)); isc_buffer_add(&buffer, strlen(name)); - dns_fixedname_init(&fixorigin); - origin = dns_fixedname_name(&fixorigin); + origin = dns_fixedname_initname(&fixorigin); CHECK(dns_name_fromtext(origin, &buffer, dns_rootname, 0, NULL)); CHECK(dns_zone_setorigin(zone, origin)); dns_zone_setview(zone, view); @@ -842,8 +841,7 @@ ns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, dns_fixedname_t fixed; dns_name_t *name; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); + name = dns_fixedname_initname(&fixed); result = dns_name_fromstring(name, origin, 0, NULL); if (result != ISC_R_SUCCESS) diff --git a/lib/ns/update.c b/lib/ns/update.c index e649663ae7a..fe077a1f501 100644 --- a/lib/ns/update.c +++ b/lib/ns/update.c @@ -694,8 +694,7 @@ foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, if (rr_action == add_rr_prepare_action) { add_rr_prepare_ctx_t *ctx = rr_action_data; - dns_fixedname_init(&fixed); - ctx->oldname = dns_fixedname_name(&fixed); + ctx->oldname = dns_fixedname_initname(&fixed); dns_name_copy(name, ctx->oldname, NULL); dns_rdataset_getownercase(&rdataset, ctx->oldname); } @@ -1716,8 +1715,7 @@ check_mx(ns_client_t *client, dns_zone_t *zone, struct in_addr addr; dns_zoneopt_t options; - dns_fixedname_init(&fixed); - foundname = dns_fixedname_name(&fixed); + foundname = dns_fixedname_initname(&fixed); dns_rdata_init(&rdata); options = dns_zone_getoptions(zone); @@ -2643,8 +2641,7 @@ update_action(isc_task_t *task, isc_event_t *event) { FAILC(result, "'RRset exists (value dependent)' " "prerequisite not satisfied"); - dns_fixedname_init(&tmpnamefixed); - tmpname = dns_fixedname_name(&tmpnamefixed); + tmpname = dns_fixedname_initname(&tmpnamefixed); result = temp_check(mctx, &temp, db, ver, tmpname, &type); if (result != ISC_R_SUCCESS) FAILNT(result, tmpname, type, diff --git a/lib/samples/nsprobe.c b/lib/samples/nsprobe.c index ec3c9dc2ae3..6830c2f6153 100644 --- a/lib/samples/nsprobe.c +++ b/lib/samples/nsprobe.c @@ -480,8 +480,7 @@ set_nextqname(struct probe_trans *trans) { domainlen = strlen(buf); isc_buffer_init(&b, buf, domainlen); isc_buffer_add(&b, domainlen); - dns_fixedname_init(&trans->fixedname); - trans->qname = dns_fixedname_name(&trans->fixedname); + trans->qname = dns_fixedname_initname(&trans->fixedname); result = dns_name_fromtext(trans->qname, &b, dns_rootname, 0, NULL); @@ -929,9 +928,8 @@ resolve_ns(isc_task_t *task, isc_event_t *event) { goto cleanup; } - dns_fixedname_init(&pns->fixedname); pns->name = - dns_fixedname_name(&pns->fixedname); + dns_fixedname_initname(&pns->fixedname); ISC_LINK_INIT(pns, link); ISC_LIST_APPEND(trans->nslist, pns, link); ISC_LIST_INIT(pns->servers); @@ -990,8 +988,7 @@ probe_domain(struct probe_trans *trans) { domainlen = strlen(buf); isc_buffer_init(&b, buf, domainlen); isc_buffer_add(&b, domainlen); - dns_fixedname_init(&trans->fixedname); - trans->qname = dns_fixedname_name(&trans->fixedname); + trans->qname = dns_fixedname_initname(&trans->fixedname); result = dns_name_fromtext(trans->qname, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) goto cleanup; diff --git a/lib/samples/resolve.c b/lib/samples/resolve.c index 0c6849c72ee..628f863f627 100644 --- a/lib/samples/resolve.c +++ b/lib/samples/resolve.c @@ -160,8 +160,7 @@ set_key(dns_client_t *client, char *keynamestr, char *keystr, namelen = strlen(keynamestr); isc_buffer_init(&b, keynamestr, namelen); isc_buffer_add(&b, namelen); - dns_fixedname_init(&fkeyname); - keyname = dns_fixedname_name(&fkeyname); + keyname = dns_fixedname_initname(&fkeyname); result = dns_name_fromtext(keyname, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { fprintf(stderr, "failed to construct key name\n"); @@ -213,8 +212,7 @@ addserver(dns_client_t *client, const char *addrstr, const char *port, namelen = strlen(name_space); isc_buffer_constinit(&b, name_space, namelen); isc_buffer_add(&b, namelen); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); + name = dns_fixedname_initname(&fname); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { fprintf(stderr, "failed to convert qname: %u\n", @@ -445,8 +443,7 @@ main(int argc, char *argv[]) { namelen = strlen(argv[0]); isc_buffer_init(&b, argv[0], namelen); isc_buffer_add(&b, namelen); - dns_fixedname_init(&qname0); - qname = dns_fixedname_name(&qname0); + qname = dns_fixedname_initname(&qname0); result = dns_name_fromtext(qname, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) fprintf(stderr, "failed to convert qname: %u\n", result); diff --git a/lib/samples/sample-async.c b/lib/samples/sample-async.c index f24e15ad914..a52de9c4cf0 100644 --- a/lib/samples/sample-async.c +++ b/lib/samples/sample-async.c @@ -222,8 +222,7 @@ dispatch_query(struct query_trans *trans) { namelen = strlen(buf); isc_buffer_init(&b, buf, namelen); isc_buffer_add(&b, namelen); - dns_fixedname_init(&trans->fixedname); - trans->qname = dns_fixedname_name(&trans->fixedname); + trans->qname = dns_fixedname_initname(&trans->fixedname); result = dns_name_fromtext(trans->qname, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) goto cleanup; diff --git a/lib/samples/sample-request.c b/lib/samples/sample-request.c index 4c2267e1760..90644c0f666 100644 --- a/lib/samples/sample-request.c +++ b/lib/samples/sample-request.c @@ -84,8 +84,7 @@ make_querymessage(dns_message_t *message, const char *namestr, namelen = strlen(namestr); isc_buffer_constinit(&b, namestr, namelen); isc_buffer_add(&b, namelen); - dns_fixedname_init(&fixedqname); - qname0 = dns_fixedname_name(&fixedqname); + qname0 = dns_fixedname_initname(&fixedqname); result = dns_name_fromtext(qname0, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { fprintf(stderr, "failed to convert qname: %u\n", result); diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c index cb97ef21a6e..d948f7e7f75 100644 --- a/lib/samples/sample-update.c +++ b/lib/samples/sample-update.c @@ -260,8 +260,7 @@ main(int argc, char *argv[]) { namelen = strlen(zonenamestr); isc_buffer_init(&b, zonenamestr, namelen); isc_buffer_add(&b, namelen); - dns_fixedname_init(&zname0); - zname = dns_fixedname_name(&zname0); + zname = dns_fixedname_initname(&zname0); result = dns_name_fromtext(zname, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) fprintf(stderr, "failed to convert zone name: %u\n", @@ -270,8 +269,7 @@ main(int argc, char *argv[]) { /* Construct prerequisite name (if given) */ if (prereqstr != NULL) { - dns_fixedname_init(&pname0); - pname = dns_fixedname_name(&pname0); + pname = dns_fixedname_initname(&pname0); evaluate_prereq(umctx, prereqstr, pname); ISC_LIST_APPEND(prereqlist, pname, link); prereqlistp = &prereqlist; @@ -279,8 +277,7 @@ main(int argc, char *argv[]) { /* Construct update name */ ISC_LIST_INIT(updatelist); - dns_fixedname_init(&uname0); - uname = dns_fixedname_name(&uname0); + uname = dns_fixedname_initname(&uname0); update_addordelete(umctx, argv[1], isdelete, uname); ISC_LIST_APPEND(updatelist, uname, link);