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 /nis/nis_findserv.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 'nis/nis_findserv.c')
-rw-r--r-- | nis/nis_findserv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nis/nis_findserv.c b/nis/nis_findserv.c index 8e01164e3d..9e2d05f56c 100644 --- a/nis/nis_findserv.c +++ b/nis/nis_findserv.c @@ -63,7 +63,7 @@ __pmap_getnisport (struct sockaddr_in *address, u_long program, struct findserv_req { struct sockaddr_in sin; - u_int32_t xid; + uint32_t xid; u_int server_nr; u_int server_ep; }; @@ -77,7 +77,7 @@ __nis_findfastest_with_timeout (dir_binding *bind, struct findserv_req *pings; struct sockaddr_in sin, saved_sin; int found = -1; - u_int32_t xid_seed; + uint32_t xid_seed; int sock, dontblock = 1; CLIENT *clnt; u_long i, j, pings_count, pings_max, fastest = -1; @@ -87,7 +87,7 @@ __nis_findfastest_with_timeout (dir_binding *bind, for multihomed hosts */ pings_count = 0; pings = malloc (sizeof (struct findserv_req) * pings_max); - xid_seed = (u_int32_t) (time (NULL) ^ getpid ()); + xid_seed = (uint32_t) (time (NULL) ^ getpid ()); if (__glibc_unlikely (pings == NULL)) return -1; @@ -158,7 +158,7 @@ __nis_findfastest_with_timeout (dir_binding *bind, for (i = 0; i < pings_count; ++i) { /* clntudp_call() will increment, subtract one */ - *((u_int32_t *) (cu->cu_outbuf)) = pings[i].xid - 1; + *((uint32_t *) (cu->cu_outbuf)) = pings[i].xid - 1; memcpy ((char *) &cu->cu_raddr, (char *) &pings[i].sin, sizeof (struct sockaddr_in)); /* Transmit to NULLPROC, return immediately. */ @@ -174,8 +174,8 @@ __nis_findfastest_with_timeout (dir_binding *bind, (xdrproc_t) xdr_void, (caddr_t) 0, *timeout); if (RPC_SUCCESS == rc) { - u_int32_t val; - memcpy (&val, cu->cu_inbuf, sizeof (u_int32_t)); + uint32_t val; + memcpy (&val, cu->cu_inbuf, sizeof (uint32_t)); fastest = val - xid_seed; if (fastest < pings_count) { bind->server_used = pings[fastest].server_nr; |