diff options
Diffstat (limited to 'contrib/bind/lib/resolv/res_debug.c')
| -rw-r--r-- | contrib/bind/lib/resolv/res_debug.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/contrib/bind/lib/resolv/res_debug.c b/contrib/bind/lib/resolv/res_debug.c index 180d67f..7f2453a 100644 --- a/contrib/bind/lib/resolv/res_debug.c +++ b/contrib/bind/lib/resolv/res_debug.c @@ -95,7 +95,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_debug.c,v 8.34 2000/02/29 05:30:55 vixie Exp $"; +static const char rcsid[] = "$Id: res_debug.c,v 8.37 2000/11/13 05:22:53 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" @@ -442,6 +442,7 @@ const struct res_sym __p_type_syms[] = { {ns_t_nimloc, "NIMLOC", "NIMROD locator (unimplemented)"}, {ns_t_srv, "SRV", "server selection"}, {ns_t_atma, "ATMA", "ATM address (unimplemented)"}, + {ns_t_tkey, "TKEY", "tkey"}, {ns_t_tsig, "TSIG", "transaction signature"}, {ns_t_ixfr, "IXFR", "incremental zone transfer"}, {ns_t_axfr, "AXFR", "zone transfer"}, @@ -629,7 +630,7 @@ precsize_ntoa(prec) val = mantissa * poweroften[exponent]; - (void) sprintf(retbuf, "%ld.%.2ld", val/100, val%100); + (void) sprintf(retbuf, "%lu.%.2lu", val/100, val%100); return (retbuf); } @@ -898,8 +899,8 @@ loc_ntoa(binary, ascii) int latdeg, latmin, latsec, latsecfrac; int longdeg, longmin, longsec, longsecfrac; - char northsouth, eastwest; - int altmeters, altfrac, altsign; + char northsouth, eastwest, *altsign; + int altmeters, altfrac; const u_int32_t referencealt = 100000 * 100; @@ -933,10 +934,10 @@ loc_ntoa(binary, ascii) GETLONG(templ, cp); if (templ < referencealt) { /* below WGS 84 spheroid */ altval = referencealt - templ; - altsign = -1; + altsign = "-"; } else { altval = templ - referencealt; - altsign = 1; + altsign = ""; } if (latval < 0) { @@ -968,7 +969,7 @@ loc_ntoa(binary, ascii) longdeg = longval; altfrac = altval % 100; - altmeters = (altval / 100) * altsign; + altmeters = (altval / 100); if ((sizestr = strdup(precsize_ntoa(sizeval))) == NULL) sizestr = error; @@ -978,10 +979,10 @@ loc_ntoa(binary, ascii) vpstr = error; sprintf(ascii, - "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %d.%.2dm %sm %sm %sm", + "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %s%d.%.2dm %sm %sm %sm", latdeg, latmin, latsec, latsecfrac, northsouth, longdeg, longmin, longsec, longsecfrac, eastwest, - altmeters, altfrac, sizestr, hpstr, vpstr); + altsign, altmeters, altfrac, sizestr, hpstr, vpstr); if (sizestr != error) free(sizestr); |
