mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	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.
		
			
				
	
	
		
			71 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			71 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Test hton/ntoh functions.
 | |
|    Copyright (C) 1997-2017 Free Software Foundation, Inc.
 | |
|    This file is part of the GNU C Library.
 | |
|    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 | |
| 
 | |
|    The GNU C Library is free software; you can redistribute it and/or
 | |
|    modify it under the terms of the GNU Lesser General Public
 | |
|    License as published by the Free Software Foundation; either
 | |
|    version 2.1 of the License, or (at your option) any later version.
 | |
| 
 | |
|    The GNU C Library is distributed in the hope that it will be useful,
 | |
|    but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|    Lesser General Public License for more details.
 | |
| 
 | |
|    You should have received a copy of the GNU Lesser General Public
 | |
|    License along with the GNU C Library; if not, see
 | |
|    <http://www.gnu.org/licenses/>.  */
 | |
| 
 | |
| #include <endian.h>
 | |
| #include <stdio.h>
 | |
| #include <sys/types.h>
 | |
| #include <netinet/in.h>
 | |
| 
 | |
| #if BYTE_ORDER == BIG_ENDIAN
 | |
| # define TEST(orig, swapped, fct) \
 | |
|   if ((fct (orig)) != (orig)) {						      \
 | |
|     printf ("Failed for %s -> %#x\n", #fct "(" #orig ")", fct (orig));	      \
 | |
|     result = 1;								      \
 | |
|   }
 | |
| #elif BYTE_ORDER == LITTLE_ENDIAN
 | |
| # define TEST(orig, swapped, fct) \
 | |
|   if ((fct (orig)) != (swapped)) {					      \
 | |
|     printf ("Failed for %s -> %#x\n", #fct "(" #orig ")", fct (orig));	      \
 | |
|     result = 1;								      \
 | |
|   }
 | |
| #else
 | |
| # error "Bah, what kind of system do you use?"
 | |
| #endif
 | |
| 
 | |
| uint32_t lo = 0x67452301;
 | |
| uint16_t foo = 0x1234;
 | |
| 
 | |
| int
 | |
| main (void)
 | |
| {
 | |
|   int result = 0;
 | |
| 
 | |
|   TEST (0x67452301, 0x01234567, htonl);
 | |
|   TEST (0x67452301, 0x01234567, (htonl));
 | |
|   TEST (0x67452301, 0x01234567, ntohl);
 | |
|   TEST (0x67452301, 0x01234567, (ntohl));
 | |
| 
 | |
|   TEST (lo, 0x01234567, htonl);
 | |
|   TEST (lo, 0x01234567, (htonl));
 | |
|   TEST (lo, 0x01234567, ntohl);
 | |
|   TEST (lo, 0x01234567, (ntohl));
 | |
| 
 | |
|   TEST (0x1234, 0x3412, htons);
 | |
|   TEST (0x1234, 0x3412, (htons));
 | |
|   TEST (0x1234, 0x3412, ntohs);
 | |
|   TEST (0x1234, 0x3412, (ntohs));
 | |
| 
 | |
|   TEST (foo, 0x3412, htons);
 | |
|   TEST (foo, 0x3412, (htons));
 | |
|   TEST (foo, 0x3412, ntohs);
 | |
|   TEST (foo, 0x3412, (ntohs));
 | |
| 
 | |
|   return result;
 | |
| }
 |