Move the flags on dns_rdataset_totext() to be together, and make a
matching change to dns_rdataset_towire()
This commit is contained in:
@@ -82,8 +82,8 @@ print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) {
|
||||
isc_region_t r;
|
||||
|
||||
isc_buffer_init(&text, t, sizeof t, ISC_BUFFERTYPE_TEXT);
|
||||
result = dns_rdataset_totext(rdataset, name, ISC_FALSE, &text,
|
||||
ISC_FALSE);
|
||||
result = dns_rdataset_totext(rdataset, name, ISC_FALSE, ISC_FALSE,
|
||||
&text);
|
||||
isc_buffer_used(&text, &r);
|
||||
if (result == DNS_R_SUCCESS)
|
||||
printf("%.*s", (int)r.length, (char *)r.base);
|
||||
|
||||
@@ -45,8 +45,8 @@ print_dataset(dns_rdatacallbacks_t *callbacks, dns_name_t *owner,
|
||||
callbacks = callbacks; /*unused*/
|
||||
|
||||
isc_buffer_init(&target, buf, 64*1024, ISC_BUFFERTYPE_TEXT);
|
||||
result = dns_rdataset_totext(dataset, owner, ISC_FALSE, &target,
|
||||
ISC_FALSE);
|
||||
result = dns_rdataset_totext(dataset, owner, ISC_FALSE, ISC_FALSE,
|
||||
&target);
|
||||
if (result == DNS_R_SUCCESS)
|
||||
fprintf(stdout, "%.*s\n", (int)target.used,
|
||||
(char*)target.base);
|
||||
|
||||
@@ -160,8 +160,8 @@ printsection(dns_message_t *msg, dns_section_t sectionid, char *section_name)
|
||||
rdataset != NULL;
|
||||
rdataset = ISC_LIST_NEXT(rdataset, link)) {
|
||||
result = dns_rdataset_totext(rdataset, print_name,
|
||||
ISC_FALSE, &target,
|
||||
no_rdata);
|
||||
ISC_FALSE, no_rdata,
|
||||
&target);
|
||||
if (result != DNS_R_SUCCESS)
|
||||
return (result);
|
||||
#ifdef USEINITALWS
|
||||
|
||||
@@ -189,8 +189,8 @@ dns_result_t
|
||||
dns_rdataset_totext(dns_rdataset_t *rdataset,
|
||||
dns_name_t *owner_name,
|
||||
isc_boolean_t omit_final_dot,
|
||||
isc_buffer_t *target,
|
||||
isc_boolean_t no_rdata_or_ttl);
|
||||
isc_boolean_t no_rdata_or_ttl,
|
||||
isc_buffer_t *target);
|
||||
/*
|
||||
* Convert 'rdataset' to text format, storing the result in 'target'.
|
||||
*
|
||||
@@ -215,9 +215,9 @@ dns_result_t
|
||||
dns_rdataset_towire(dns_rdataset_t *rdataset,
|
||||
dns_name_t *owner_name,
|
||||
dns_compress_t *cctx,
|
||||
isc_boolean_t no_rdata_or_ttl,
|
||||
isc_buffer_t *target,
|
||||
unsigned int *countp,
|
||||
isc_boolean_t no_rdata_or_ttl);
|
||||
unsigned int *countp);
|
||||
/*
|
||||
* Convert 'rdataset' to wire format, compressing names as specified
|
||||
* in cctx, and storing the result in 'target'.
|
||||
|
||||
@@ -1150,8 +1150,9 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid,
|
||||
count = 0;
|
||||
|
||||
result = dns_rdataset_towire(rdataset, name,
|
||||
&msg->cctx, &subbuffer,
|
||||
&count, no_render_rdata);
|
||||
&msg->cctx,
|
||||
no_render_rdata,
|
||||
&subbuffer, &count);
|
||||
|
||||
/*
|
||||
* If out of space, record stats on what we rendered
|
||||
|
||||
@@ -160,8 +160,8 @@ dns_result_t
|
||||
dns_rdataset_totext(dns_rdataset_t *rdataset,
|
||||
dns_name_t *owner_name,
|
||||
isc_boolean_t omit_final_dot,
|
||||
isc_buffer_t *target,
|
||||
isc_boolean_t no_rdata_or_ttl)
|
||||
isc_boolean_t no_rdata_or_ttl,
|
||||
isc_buffer_t *target)
|
||||
{
|
||||
dns_result_t result;
|
||||
unsigned int common_start, common_length, length, ntabs, ttabs;
|
||||
@@ -281,9 +281,9 @@ dns_result_t
|
||||
dns_rdataset_towire(dns_rdataset_t *rdataset,
|
||||
dns_name_t *owner_name,
|
||||
dns_compress_t *cctx,
|
||||
isc_boolean_t no_rdata_or_ttl,
|
||||
isc_buffer_t *target,
|
||||
unsigned int *countp,
|
||||
isc_boolean_t no_rdata_or_ttl)
|
||||
unsigned int *countp)
|
||||
{
|
||||
dns_rdata_t rdata;
|
||||
isc_region_t r;
|
||||
|
||||
Reference in New Issue
Block a user