diff options
| author |   florian <florian@openbsd.org> | 2020-02-26 18:47:58 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2020-02-26 18:47:58 +0000 |
| commit | 873f12b9e6aaf39ba104db6af3d0dc687cd95f7e (patch) | |
| tree | 80081a71df3f42a8248c43286fef79e79ede9a40 /usr.bin/dig/lib/dns/rdata/generic/soa_6.c | |
| parent | In preparation of compiling lib/dns/rdata/ files individually we need (diff) | |
| download | wireguard-openbsd-873f12b9e6aaf39ba104db6af3d0dc687cd95f7e.tar.xz wireguard-openbsd-873f12b9e6aaf39ba104db6af3d0dc687cd95f7e.zip | |
In preparation of compiling lib/dns/rdata/ files individually we need
global visibility of str_totext.
Rename it to isc_str_tobuffer, put it into buffer.c and delete
duplicate implementations.
Diffstat (limited to 'usr.bin/dig/lib/dns/rdata/generic/soa_6.c')
| -rw-r--r-- | usr.bin/dig/lib/dns/rdata/generic/soa_6.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/dig/lib/dns/rdata/generic/soa_6.c b/usr.bin/dig/lib/dns/rdata/generic/soa_6.c index 5a5ded87108..307f660d10c 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/soa_6.c +++ b/usr.bin/dig/lib/dns/rdata/generic/soa_6.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: soa_6.c,v 1.7 2020/02/26 18:38:15 florian Exp $ */ +/* $Id: soa_6.c,v 1.8 2020/02/26 18:47:59 florian Exp $ */ /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */ @@ -60,14 +60,14 @@ totext_soa(ARGS_TOTEXT) { sub = name_prefix(&mname, tctx->origin, &prefix); RETERR(dns_name_totext(&prefix, sub, target)); - RETERR(str_totext(" ", target)); + RETERR(isc_str_tobuffer(" ", target)); sub = name_prefix(&rname, tctx->origin, &prefix); RETERR(dns_name_totext(&prefix, sub, target)); if (multiline) - RETERR(str_totext(" (" , target)); - RETERR(str_totext(tctx->linebreak, target)); + RETERR(isc_str_tobuffer(" (" , target)); + RETERR(isc_str_tobuffer(tctx->linebreak, target)); for (i = 0; i < 5; i++) { char buf[sizeof("0123456789 ; ")]; @@ -75,23 +75,23 @@ totext_soa(ARGS_TOTEXT) { num = uint32_fromregion(&dregion); isc_region_consume(&dregion, 4); snprintf(buf, sizeof(buf), comm ? "%-10lu ; " : "%lu", num); - RETERR(str_totext(buf, target)); + RETERR(isc_str_tobuffer(buf, target)); if (comm) { - RETERR(str_totext(soa_fieldnames[i], target)); + RETERR(isc_str_tobuffer(soa_fieldnames[i], target)); /* Print times in week/day/hour/minute/second form */ if (i >= 1) { - RETERR(str_totext(" (", target)); + RETERR(isc_str_tobuffer(" (", target)); RETERR(dns_ttl_totext(num, ISC_TRUE, target)); - RETERR(str_totext(")", target)); + RETERR(isc_str_tobuffer(")", target)); } - RETERR(str_totext(tctx->linebreak, target)); + RETERR(isc_str_tobuffer(tctx->linebreak, target)); } else if (i < 4) { - RETERR(str_totext(tctx->linebreak, target)); + RETERR(isc_str_tobuffer(tctx->linebreak, target)); } } if (multiline) - RETERR(str_totext(")", target)); + RETERR(isc_str_tobuffer(")", target)); return (ISC_R_SUCCESS); } |