diff options
author | Joseph Myers <joseph@codesourcery.com> | 2017-08-07 19:55:34 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2017-08-07 19:55:34 +0000 |
commit | d9fee042e252b229f8f967bf36492c97ec112fa8 (patch) | |
tree | a11fcccd8ed74405c4b50da46e01a6015c90d9d8 /resolv/res_debug.c | |
parent | 8b1647877c7f797161dfe1a6b35eab8534d98f9f (diff) | |
download | glibc-d9fee042e252b229f8f967bf36492c97ec112fa8.tar.gz glibc-d9fee042e252b229f8f967bf36492c97ec112fa8.tar.xz glibc-d9fee042e252b229f8f967bf36492c97ec112fa8.zip |
Consistently use uintN_t not u_intN_t everywhere.
This patch changes the remaining uses of the old nonstandard u_intN_t types in glibc to use the C99 uintN_t instead, except for the definitions of those typedefs and the tests of them in the c++-types test. This follows the previous such fix for libm, and being consistent in using uintN_t makes sense as a global cleanup. Tested for x86_64, and with build-many-glibcs.py. * catgets/catgets.c (catgets): Use uintN_t instead of u_intN_t. * catgets/catgetsinfo.h (struct catalog_obj): Likewise. (struct catalog_info): Likewise. * inet/htontest.c (lo): Likewise. (foo): Likewise. * inet/inet_lnaof.c (inet_lnaof): Likewise. * inet/inet_net.c (inet_network): Likewise. * inet/inet_netof.c (inet_netof): Likewise. * inet/rcmd.c (__ivaliduser): Likewise. (iruserok): Likewise. * locale/loadlocale.c (_nl_intern_locale_data): Likewise. * locale/programs/locale-spec.c (locale_special): Likewise. * nis/nis_findserv.c (struct findserv_req): Likewise. (__nis_findfastest_with_timeout): Likewise. * nss/test-netdb.c (test_network): Likewise. * resolv/inet_neta.c (inet_neta): Likewise. * resolv/ns_date.c (ns_datetosecs): Likewise. (SECS_PER_DAY): Likewise. * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyaddr_r): Likewise. * resolv/res_comp.c (__putlong): Likewise. (__putshort): Likewise. (_getlong): Likewise. (_getshort): Likewise. * resolv/res_debug.c (p_time): Likewise. (precsize_ntoa): Likewise. (precsize_aton): Likewise. (latlon2ul): Likewise. (loc_aton): Likewise. (loc_ntoa): Likewise. * resolv/res_hconf.c (struct netaddr): Likewise. (_res_hconf_reorder_addrs): Likewise. * sunrpc/clnt_tcp.c (clnttcp_call): Likewise. (clnttcp_control): Likewise. * sunrpc/clnt_udp.c (clntudp_call): Likewise. (clntudp_control): Likewise. * sunrpc/clnt_unix.c (clntunix_call): Likewise. (clntunix_control): Likewise. * sunrpc/pmap_rmt.c (clnt_broadcast): Likewise. * sunrpc/rpc/auth.h (union des_block): Likewise. * sunrpc/tst-udp-nonblocking.c (do_test): Likewise. * sunrpc/xdr_rec.c (struct rec_strm): Likewise. (xdrrec_create): Likewise. (xdrrec_endofrecord): Likewise. (flush_out): Likewise. * sunrpc/xdr_stdio.c (xdrstdio_getlong): Likewise. (xdrstdio_putlong): Likewise. * sysdeps/unix/sysv/linux/errqueue.h (struct sock_extended_err): Likewise.
Diffstat (limited to 'resolv/res_debug.c')
-rw-r--r-- | resolv/res_debug.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/resolv/res_debug.c b/resolv/res_debug.c index 919b86e2b3..4114c2db46 100644 --- a/resolv/res_debug.c +++ b/resolv/res_debug.c @@ -625,7 +625,7 @@ libresolv_hidden_def (p_option) * Return a mnemonic for a time to live. */ const char * -p_time(u_int32_t value) { +p_time(uint32_t value) { static char nbuf[40]; /* XXX nonreentrant */ if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0) @@ -654,7 +654,7 @@ static const unsigned int poweroften[10]= /* takes an XeY precision/size value, returns a string representation. */ static const char * -precsize_ntoa (u_int8_t prec) +precsize_ntoa (uint8_t prec) { static char retbuf[sizeof "90000000.00"]; /* XXX nonreentrant */ unsigned long val; @@ -670,11 +670,11 @@ precsize_ntoa (u_int8_t prec) } /* converts ascii size/precision X * 10**Y(cm) to 0xXY. moves pointer. */ -static u_int8_t +static uint8_t precsize_aton (const char **strptr) { unsigned int mval = 0, cmval = 0; - u_int8_t retval = 0; + uint8_t retval = 0; const char *cp; int exponent; int mantissa; @@ -711,11 +711,11 @@ precsize_aton (const char **strptr) } /* converts ascii lat/lon to unsigned encoded 32-bit number. moves pointer. */ -static u_int32_t +static uint32_t latlon2ul (const char **latlonstrptr, int *which) { const char *cp; - u_int32_t retval; + uint32_t retval; int deg = 0, min = 0, secs = 0, secsfrac = 0; cp = *latlonstrptr; @@ -814,12 +814,12 @@ loc_aton (const char *ascii, u_char *binary) const char *cp, *maxcp; u_char *bcp; - u_int32_t latit = 0, longit = 0, alt = 0; - u_int32_t lltemp1 = 0, lltemp2 = 0; + uint32_t latit = 0, longit = 0, alt = 0; + uint32_t lltemp1 = 0, lltemp2 = 0; int altmeters = 0, altfrac = 0, altsign = 1; - u_int8_t hp = 0x16; /* default = 1e6 cm = 10000.00m = 10km */ - u_int8_t vp = 0x13; /* default = 1e3 cm = 10.00m */ - u_int8_t siz = 0x12; /* default = 1e2 cm = 1.00m */ + uint8_t hp = 0x16; /* default = 1e6 cm = 10000.00m = 10km */ + uint8_t vp = 0x13; /* default = 1e3 cm = 10.00m */ + uint8_t siz = 0x12; /* default = 1e2 cm = 1.00m */ int which1 = 0, which2 = 0; cp = ascii; @@ -905,7 +905,7 @@ loc_aton (const char *ascii, u_char *binary) defaults: bcp = binary; - *bcp++ = (u_int8_t) 0; /* version byte */ + *bcp++ = (uint8_t) 0; /* version byte */ *bcp++ = siz; *bcp++ = hp; *bcp++ = vp; @@ -930,11 +930,11 @@ loc_ntoa (const u_char *binary, char *ascii) char northsouth, eastwest; int altmeters, altfrac, altsign; - const u_int32_t referencealt = 100000 * 100; + const uint32_t referencealt = 100000 * 100; int32_t latval, longval, altval; - u_int32_t templ; - u_int8_t sizeval, hpval, vpval, versionval; + uint32_t templ; + uint8_t sizeval, hpval, vpval, versionval; char *sizestr, *hpstr, *vpstr; |