aboutsummaryrefslogtreecommitdiff
path: root/catgets
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 /catgets
parent8b1647877c7f797161dfe1a6b35eab8534d98f9f (diff)
downloadglibc-d9fee042e252b229f8f967bf36492c97ec112fa8.tar
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 'catgets')
-rw-r--r--catgets/catgets.c4
-rw-r--r--catgets/catgetsinfo.h10
2 files changed, 7 insertions, 7 deletions
diff --git a/catgets/catgets.c b/catgets/catgets.c
index 886ed1acce..321201c862 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 e32d1933fb..65cf2360e9 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;