about summary refs log tree commit diff
path: root/sunrpc/pmap_rmt.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-08-07 19:55:34 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-08-07 19:55:34 +0000
commitd9fee042e252b229f8f967bf36492c97ec112fa8 (patch)
treea11fcccd8ed74405c4b50da46e01a6015c90d9d8 /sunrpc/pmap_rmt.c
parent8b1647877c7f797161dfe1a6b35eab8534d98f9f (diff)
downloadglibc-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 'sunrpc/pmap_rmt.c')
-rw-r--r--sunrpc/pmap_rmt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c
index 6d4ed7206c..3bdffcecd2 100644
--- a/sunrpc/pmap_rmt.c
+++ b/sunrpc/pmap_rmt.c
@@ -352,7 +352,7 @@ clnt_broadcast (/* program number */
       xdrmem_create (xdrs, inbuf, (u_int) inlen, XDR_DECODE);
       if (xdr_replymsg (xdrs, &msg))
 	{
-	  if (((u_int32_t) msg.rm_xid == (u_int32_t) xid) &&
+	  if (((uint32_t) msg.rm_xid == (uint32_t) xid) &&
 	      (msg.rm_reply.rp_stat == MSG_ACCEPTED) &&
 	      (msg.acpted_rply.ar_stat == SUCCESS))
 	    {
@@ -365,7 +365,7 @@ clnt_broadcast (/* program number */
 	{
 #ifdef notdef
 	  /* some kind of deserialization problem ... */
-	  if ((u_int32_t) msg.rm_xid == (u_int32_t) xid)
+	  if ((uint32_t) msg.rm_xid == (uint32_t) xid)
 	    fprintf (stderr, "Broadcast deserialization problem");
 	  /* otherwise, just random garbage */
 #endif