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.

6 files changed, 29 insertions, 29 deletions

diff --git a/resolv/inet_neta.c b/resolv/inet_neta.c
index 348ff47..f26932c 100644
--- a/resolv/inet_neta.c
+++ b/resolv/inet_neta.c
@@ -42,7 +42,7 @@
  *	Paul Vixie (ISC), July 1996
  */
 char *
-inet_neta (u_int32_t src, char *dst, size_t size)
+inet_neta (uint32_t src, char *dst, size_t size)
 {
 	char *odst = dst;
 	char *tp;
diff --git a/resolv/ns_date.c b/resolv/ns_date.c
index 31cef74..8e94d1c 100644
--- a/resolv/ns_date.c
+++ b/resolv/ns_date.c
@@ -39,10 +39,10 @@ static int	datepart(const char *, int, int, int, int *);
  * digits required, no spaces allowed.
  */
 
-u_int32_t
+uint32_t
 ns_datetosecs(const char *cp, int *errp) {
 	struct tm time;
-	u_int32_t result;
+	uint32_t result;
 	int mdays, i;
 	static const int days_per_month[12] =
 		{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
@@ -68,7 +68,7 @@ ns_datetosecs(const char *cp, int *errp) {
 	 * we will do it by hand.  Roll up sleeves, curse the gods, begin!
 	 */
 
-#define SECS_PER_DAY    ((u_int32_t)24*60*60)
+#define SECS_PER_DAY    ((uint32_t)24*60*60)
 #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
 
 	result  = time.tm_sec;				/*%< Seconds */
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index f190eb2..fdad6da 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -168,7 +168,7 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result,
   unsigned int net_bytes[4];
   char qbuf[MAXDNAME];
   int cnt, anslen;
-  u_int32_t net2;
+  uint32_t net2;
   int olderr = errno;
 
   /* No net address lookup for IPv6 yet.  */
@@ -183,7 +183,7 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result,
       return NSS_STATUS_UNAVAIL;
     }
 
-  net2 = (u_int32_t) net;
+  net2 = (uint32_t) net;
   for (cnt = 4; net2 != 0; net2 >>= 8)
     net_bytes[--cnt] = net2 & 0xff;
 
diff --git a/resolv/res_comp.c b/resolv/res_comp.c
index ffb2ed5..1b47a5d 100644
--- a/resolv/res_comp.c
+++ b/resolv/res_comp.c
@@ -236,12 +236,12 @@ libresolv_hidden_def (res_dnok)
  *	__getshort
  * Note that one _ comes from C and the others come from us.
  */
-void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); }
+void __putlong(uint32_t src, u_char *dst) { ns_put32(src, dst); }
 libresolv_hidden_def (__putlong)
-void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
+void __putshort(uint16_t src, u_char *dst) { ns_put16(src, dst); }
 libresolv_hidden_def (__putshort)
-u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); }
-u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); }
+uint32_t _getlong(const u_char *src) { return (ns_get32(src)); }
+uint16_t _getshort(const u_char *src) { return (ns_get16(src)); }
 
 
 #include <shlib-compat.h>
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index 919b86e..4114c2d 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;
 
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index 8fc06e9..6a4c5b4 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -339,8 +339,8 @@ static struct netaddr
   {
     struct
     {
-      u_int32_t	addr;
-      u_int32_t	mask;
+      uint32_t	addr;
+      uint32_t	mask;
     } ipv4;
   } u;
 } *ifaddrs);
@@ -509,8 +509,8 @@ _res_hconf_reorder_addrs (struct hostent *hp)
 
       for (j = 0; j < num_ifs_local; ++j)
 	{
-	  u_int32_t if_addr    = ifaddrs[j].u.ipv4.addr;
-	  u_int32_t if_netmask = ifaddrs[j].u.ipv4.mask;
+	  uint32_t if_addr    = ifaddrs[j].u.ipv4.addr;
+	  uint32_t if_netmask = ifaddrs[j].u.ipv4.mask;
 
 	  if (((haddr->s_addr ^ if_addr) & if_netmask) == 0)
 	    {