This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Consistently use uintN_t not u_intN_t everywhere
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Sat, 5 Aug 2017 00:20:56 +0000
- Subject: Consistently use uintN_t not u_intN_t everywhere
- Authentication-results: sourceware.org; auth=none
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.
2017-08-04 Joseph Myers <joseph@codesourcery.com>
* 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.
diff --git a/catgets/catgets.c b/catgets/catgets.c
index 886ed1a..321201c 100644
--- a/catgets/catgets.c
+++ b/catgets/catgets.c
@@ -102,8 +102,8 @@ catgets (nl_catd catalog_desc, int set, int message, const char *string)
cnt = 0;
do
{
- if (catalog->name_ptr[idx + 0] == (u_int32_t) set
- && catalog->name_ptr[idx + 1] == (u_int32_t) message)
+ if (catalog->name_ptr[idx + 0] == (uint32_t) set
+ && catalog->name_ptr[idx + 1] == (uint32_t) message)
return (char *) &catalog->strings[catalog->name_ptr[idx + 2]];
idx += catalog->plane_size * 3;
diff --git a/catgets/catgetsinfo.h b/catgets/catgetsinfo.h
index e32d193..65cf236 100644
--- a/catgets/catgetsinfo.h
+++ b/catgets/catgetsinfo.h
@@ -21,12 +21,12 @@
struct catalog_obj
{
- u_int32_t magic;
- u_int32_t plane_size;
- u_int32_t plane_depth;
+ uint32_t magic;
+ uint32_t plane_size;
+ uint32_t plane_depth;
/* This is in fact two arrays in one: always a pair of name and
pointer into the data area. */
- u_int32_t name_ptr[0];
+ uint32_t name_ptr[0];
};
@@ -37,7 +37,7 @@ typedef struct catalog_info
size_t plane_size;
size_t plane_depth;
- u_int32_t *name_ptr;
+ uint32_t *name_ptr;
const char *strings;
struct catalog_obj *file_ptr;
diff --git a/inet/htontest.c b/inet/htontest.c
index 9bc0063..ae47dec 100644
--- a/inet/htontest.c
+++ b/inet/htontest.c
@@ -38,8 +38,8 @@
# error "Bah, what kind of system do you use?"
#endif
-u_int32_t lo = 0x67452301;
-u_int16_t foo = 0x1234;
+uint32_t lo = 0x67452301;
+uint16_t foo = 0x1234;
int
main (void)
diff --git a/inet/inet_lnaof.c b/inet/inet_lnaof.c
index fc8196b..c9e2586 100644
--- a/inet/inet_lnaof.c
+++ b/inet/inet_lnaof.c
@@ -39,7 +39,7 @@
in_addr_t
inet_lnaof (struct in_addr in)
{
- u_int32_t i = ntohl(in.s_addr);
+ uint32_t i = ntohl(in.s_addr);
if (IN_CLASSA(i))
return ((i)&IN_CLASSA_HOST);
diff --git a/inet/inet_net.c b/inet/inet_net.c
index 434d716..7639f99 100644
--- a/inet/inet_net.c
+++ b/inet/inet_net.c
@@ -54,12 +54,12 @@
* The library routines call this routine to interpret
* network numbers.
*/
-u_int32_t
+uint32_t
inet_network (const char *cp)
{
- u_int32_t val, base, n, i;
+ uint32_t val, base, n, i;
char c;
- u_int32_t parts[4], *pp = parts;
+ uint32_t parts[4], *pp = parts;
int digit;
again:
diff --git a/inet/inet_netof.c b/inet/inet_netof.c
index ef6281d..22b9192 100644
--- a/inet/inet_netof.c
+++ b/inet/inet_netof.c
@@ -38,7 +38,7 @@
in_addr_t
inet_netof (struct in_addr in)
{
- u_int32_t i = ntohl(in.s_addr);
+ uint32_t i = ntohl(in.s_addr);
if (IN_CLASSA(i))
return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
diff --git a/inet/rcmd.c b/inet/rcmd.c
index e970123..976894c 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -81,7 +81,7 @@
#include <sigsetops.h>
-int __ivaliduser (FILE *, u_int32_t, const char *, const char *);
+int __ivaliduser (FILE *, uint32_t, const char *, const char *);
static int __validuser2_sa (FILE *, struct sockaddr *, size_t,
const char *, const char *, const char *);
static int ruserok2_sa (struct sockaddr *ra, size_t ralen,
@@ -92,7 +92,7 @@ static int ruserok_sa (struct sockaddr *ra, size_t ralen,
const char *luser);
int iruserok_af (const void *raddr, int superuser, const char *ruser,
const char *luser, sa_family_t af);
-int iruserok (u_int32_t raddr, int superuser, const char *ruser,
+int iruserok (uint32_t raddr, int superuser, const char *ruser,
const char *luser);
libc_hidden_proto (iruserok_af)
@@ -615,7 +615,7 @@ iruserok_af (const void *raddr, int superuser, const char *ruser,
libc_hidden_def (iruserok_af)
int
-iruserok (u_int32_t raddr, int superuser, const char *ruser, const char *luser)
+iruserok (uint32_t raddr, int superuser, const char *ruser, const char *luser)
{
return iruserok_af (&raddr, superuser, ruser, luser, AF_INET);
}
@@ -632,7 +632,7 @@ iruserok (u_int32_t raddr, int superuser, const char *ruser, const char *luser)
* Returns 0 if ok, -1 if not ok.
*/
int
-__ivaliduser (FILE *hostf, u_int32_t raddr, const char *luser,
+__ivaliduser (FILE *hostf, uint32_t raddr, const char *luser,
const char *ruser)
{
struct sockaddr_in ra;
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index 9bca304..162dd1a 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -152,7 +152,7 @@ _nl_intern_locale_data (int category, const void *data, size_t datasize)
if (!LOCFILE_ALIGNED_P (idx))
goto puntdata;
newdata->values[cnt].word =
- *((const u_int32_t *) (newdata->filedata + idx));
+ *((const uint32_t *) (newdata->filedata + idx));
}
}
diff --git a/locale/programs/locale-spec.c b/locale/programs/locale-spec.c
index 4e9bf81..d47b951 100644
--- a/locale/programs/locale-spec.c
+++ b/locale/programs/locale-spec.c
@@ -53,7 +53,7 @@ locale_special (const char *name, int show_category_name,
size_t cnt;
for (cnt = 0; cnt < nelem; ++cnt)
- if (__collate_element_hash[2 * cnt] != (~((u_int32_t) 0)))
+ if (__collate_element_hash[2 * cnt] != (~((uint32_t) 0)))
{
size_t idx = __collate_element_hash[2 * cnt];
diff --git a/nis/nis_findserv.c b/nis/nis_findserv.c
index 8e01164..9e2d05f 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;
diff --git a/nss/test-netdb.c b/nss/test-netdb.c
index 319541b..6b34b1a 100644
--- a/nss/test-netdb.c
+++ b/nss/test-netdb.c
@@ -232,7 +232,7 @@ static void
test_network (void)
{
struct netent *nptr;
- u_int32_t ip;
+ uint32_t ip;
/*
This test needs the following line in /etc/networks:
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)
{
diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c
index e311b35..249e9c3 100644
--- a/sunrpc/clnt_tcp.c
+++ b/sunrpc/clnt_tcp.c
@@ -233,7 +233,7 @@ clnttcp_call (CLIENT *h, u_long proc, xdrproc_t xdr_args, caddr_t args_ptr,
XDR *xdrs = &(ct->ct_xdrs);
struct rpc_msg reply_msg;
u_long x_id;
- u_int32_t *msg_x_id = (u_int32_t *) (ct->ct_mcall); /* yuk */
+ uint32_t *msg_x_id = (uint32_t *) (ct->ct_mcall); /* yuk */
bool_t shipnow;
int refreshes = 2;
@@ -291,7 +291,7 @@ call_again:
continue;
return ct->ct_error.re_status;
}
- if ((u_int32_t) reply_msg.rm_xid == (u_int32_t) x_id)
+ if ((uint32_t) reply_msg.rm_xid == (uint32_t) x_id)
break;
}
@@ -356,7 +356,7 @@ clnttcp_control (CLIENT *cl, int request, char *info)
{
struct ct_data *ct = (struct ct_data *) cl->cl_private;
u_long ul;
- u_int32_t ui32;
+ uint32_t ui32;
switch (request)
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index df21e28..c2436e3 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -465,7 +465,7 @@ send_again:
if (inlen >= 4
&& (xargs == NULL
|| memcmp (cu->cu_inbuf, cu->cu_outbuf,
- sizeof (u_int32_t)) == 0))
+ sizeof (uint32_t)) == 0))
break;
next_response:
@@ -543,7 +543,7 @@ clntudp_control (CLIENT *cl, int request, char *info)
{
struct cu_data *cu = (struct cu_data *) cl->cl_private;
u_long ul;
- u_int32_t ui32;
+ uint32_t ui32;
switch (request)
{
diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c
index 8591be5..33a02cc 100644
--- a/sunrpc/clnt_unix.c
+++ b/sunrpc/clnt_unix.c
@@ -212,7 +212,7 @@ clntunix_call (CLIENT *h, u_long proc, xdrproc_t xdr_args, caddr_t args_ptr,
XDR *xdrs = &(ct->ct_xdrs);
struct rpc_msg reply_msg;
u_long x_id;
- u_int32_t *msg_x_id = (u_int32_t *) (ct->ct_mcall); /* yuk */
+ uint32_t *msg_x_id = (uint32_t *) (ct->ct_mcall); /* yuk */
bool_t shipnow;
int refreshes = 2;
@@ -332,7 +332,7 @@ clntunix_control (CLIENT *cl, int request, char *info)
{
struct ct_data *ct = (struct ct_data *) cl->cl_private;
u_long ul;
- u_int32_t ui32;
+ uint32_t ui32;
switch (request)
{
diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c
index 6d4ed72..3bdffce 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
diff --git a/sunrpc/rpc/auth.h b/sunrpc/rpc/auth.h
index b25dcfc..e01b077 100644
--- a/sunrpc/rpc/auth.h
+++ b/sunrpc/rpc/auth.h
@@ -68,8 +68,8 @@ enum auth_stat {
union des_block {
struct {
- u_int32_t high;
- u_int32_t low;
+ uint32_t high;
+ uint32_t low;
} key;
char c[8];
};
diff --git a/sunrpc/tst-udp-nonblocking.c b/sunrpc/tst-udp-nonblocking.c
index 1d6a7f4..c6a6849 100644
--- a/sunrpc/tst-udp-nonblocking.c
+++ b/sunrpc/tst-udp-nonblocking.c
@@ -249,7 +249,7 @@ do_test (void)
/* Reset the xid because it is changed by each invocation of
clnt_call. Subtract one to compensate for the xid update
during the call. */
- *((u_int32_t *) (cu->cu_outbuf)) = servers[i].xid - 1;
+ *((uint32_t *) (cu->cu_outbuf)) = servers[i].xid - 1;
cu->cu_raddr = servers[i].address;
struct test_query query = { .a = 100, .b = i + 1 };
diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c
index fafa591..9dee4f0 100644
--- a/sunrpc/xdr_rec.c
+++ b/sunrpc/xdr_rec.c
@@ -102,7 +102,7 @@ typedef struct rec_strm
caddr_t out_base; /* output buffer (points to frag header) */
caddr_t out_finger; /* next output position */
caddr_t out_boundry; /* data cannot up to this address */
- u_int32_t *frag_header; /* beginning of curren fragment */
+ uint32_t *frag_header; /* beginning of curren fragment */
bool_t frag_sent; /* true if buffer sent in middle of record */
/*
* in-coming bits
@@ -181,7 +181,7 @@ xdrrec_create (XDR *xdrs, u_int sendsize,
rstrm->readit = readit;
rstrm->writeit = writeit;
rstrm->out_finger = rstrm->out_boundry = rstrm->out_base;
- rstrm->frag_header = (u_int32_t *) rstrm->out_base;
+ rstrm->frag_header = (uint32_t *) rstrm->out_base;
rstrm->out_finger += 4;
rstrm->out_boundry += sendsize;
rstrm->frag_sent = FALSE;
@@ -526,7 +526,7 @@ xdrrec_endofrecord (XDR *xdrs, bool_t sendnow)
len = (rstrm->out_finger - (char *) rstrm->frag_header
- BYTES_PER_XDR_UNIT);
*rstrm->frag_header = htonl ((u_long) len | LAST_FRAG);
- rstrm->frag_header = (u_int32_t *) rstrm->out_finger;
+ rstrm->frag_header = (uint32_t *) rstrm->out_finger;
rstrm->out_finger += BYTES_PER_XDR_UNIT;
return TRUE;
}
@@ -549,7 +549,7 @@ flush_out (RECSTREAM *rstrm, bool_t eor)
if ((*(rstrm->writeit)) (rstrm->tcp_handle, rstrm->out_base, (int) len)
!= (int) len)
return FALSE;
- rstrm->frag_header = (u_int32_t *) rstrm->out_base;
+ rstrm->frag_header = (uint32_t *) rstrm->out_base;
rstrm->out_finger = (caddr_t) rstrm->out_base + BYTES_PER_XDR_UNIT;
return TRUE;
}
diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
index 6ab514b..0c2cbb7 100644
--- a/sunrpc/xdr_stdio.c
+++ b/sunrpc/xdr_stdio.c
@@ -106,7 +106,7 @@ xdrstdio_destroy (XDR *xdrs)
static bool_t
xdrstdio_getlong (XDR *xdrs, long *lp)
{
- u_int32_t mycopy;
+ uint32_t mycopy;
if (fread ((caddr_t) &mycopy, 4, 1, (FILE *) xdrs->x_private) != 1)
return FALSE;
@@ -117,7 +117,7 @@ xdrstdio_getlong (XDR *xdrs, long *lp)
static bool_t
xdrstdio_putlong (XDR *xdrs, const long *lp)
{
- int32_t mycopy = htonl ((u_int32_t) *lp);
+ int32_t mycopy = htonl ((uint32_t) *lp);
if (fwrite ((caddr_t) &mycopy, 4, 1, (FILE *) xdrs->x_private) != 1)
return FALSE;
diff --git a/sysdeps/unix/sysv/linux/errqueue.h b/sysdeps/unix/sysv/linux/errqueue.h
index 963eb33..02ba33b 100644
--- a/sysdeps/unix/sysv/linux/errqueue.h
+++ b/sysdeps/unix/sysv/linux/errqueue.h
@@ -25,13 +25,13 @@
struct sock_extended_err
{
- u_int32_t ee_errno;
- u_int8_t ee_origin;
- u_int8_t ee_type;
- u_int8_t ee_code;
- u_int8_t ee_pad;
- u_int32_t ee_info;
- u_int32_t ee_data;
+ uint32_t ee_errno;
+ uint8_t ee_origin;
+ uint8_t ee_type;
+ uint8_t ee_code;
+ uint8_t ee_pad;
+ uint32_t ee_info;
+ uint32_t ee_data;
};
#define SO_EE_ORIGIN_NONE 0
--
Joseph S. Myers
joseph@codesourcery.com