diff options
author | 2017-08-07 19:55:34 +0000 | |
---|---|---|
committer | 2017-08-07 19:55:34 +0000 | |
commit | d9fee042e252b229f8f967bf36492c97ec112fa8 (patch) | |
tree | a11fcccd8ed74405c4b50da46e01a6015c90d9d8 /inet | |
parent | Remove __long_double_t. (diff) | |
download | glibc-d9fee042e252b229f8f967bf36492c97ec112fa8.tar.gz glibc-d9fee042e252b229f8f967bf36492c97ec112fa8.tar.bz2 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 'inet')
-rw-r--r-- | inet/htontest.c | 4 | ||||
-rw-r--r-- | inet/inet_lnaof.c | 2 | ||||
-rw-r--r-- | inet/inet_net.c | 6 | ||||
-rw-r--r-- | inet/inet_netof.c | 2 | ||||
-rw-r--r-- | inet/rcmd.c | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/inet/htontest.c b/inet/htontest.c index 9bc006396d..ae47dec96c 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 fc8196b709..c9e25869b8 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 434d716854..7639f99d3b 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 ef6281d29f..22b91920b5 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 e970123a9a..976894c2c5 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; |