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.
		
			
				
	
	
		
			150 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			150 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Copyright (C) 1996-2017 Free Software Foundation, Inc.
 | |
|    This file is part of the GNU C Library.
 | |
|    Contributed by Ulrich Drepper, <drepper@gnu.org>.
 | |
| 
 | |
|    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 <errno.h>
 | |
| #include <locale.h>
 | |
| #include <nl_types.h>
 | |
| #include <stdlib.h>
 | |
| #include <string.h>
 | |
| #include <unistd.h>
 | |
| #include <sys/mman.h>
 | |
| 
 | |
| #include "catgetsinfo.h"
 | |
| 
 | |
| 
 | |
| /* Open the catalog and return a descriptor for the catalog.  */
 | |
| nl_catd
 | |
| catopen (const char *cat_name, int flag)
 | |
| {
 | |
|   __nl_catd result;
 | |
|   const char *env_var = NULL;
 | |
|   const char *nlspath = NULL;
 | |
|   char *tmp = NULL;
 | |
| 
 | |
|   if (strchr (cat_name, '/') == NULL)
 | |
|     {
 | |
|       if (flag == NL_CAT_LOCALE)
 | |
| 	/* Use the current locale setting for LC_MESSAGES.  */
 | |
| 	env_var = setlocale (LC_MESSAGES, NULL);
 | |
|       else
 | |
| 	/* Use the LANG environment variable.  */
 | |
| 	env_var = getenv ("LANG");
 | |
| 
 | |
|       if (env_var == NULL || *env_var == '\0'
 | |
| 	  || (__libc_enable_secure && strchr (env_var, '/') != NULL))
 | |
| 	env_var = "C";
 | |
| 
 | |
|       nlspath = getenv ("NLSPATH");
 | |
|       if (nlspath != NULL && *nlspath != '\0')
 | |
| 	{
 | |
| 	  /* Append the system dependent directory.  */
 | |
| 	  size_t len = strlen (nlspath) + 1 + sizeof NLSPATH;
 | |
| 	  tmp = malloc (len);
 | |
| 
 | |
| 	  if (__glibc_unlikely (tmp == NULL))
 | |
| 	    return (nl_catd) -1;
 | |
| 
 | |
| 	  __stpcpy (__stpcpy (__stpcpy (tmp, nlspath), ":"), NLSPATH);
 | |
| 	  nlspath = tmp;
 | |
| 	}
 | |
|       else
 | |
| 	nlspath = NLSPATH;
 | |
|     }
 | |
| 
 | |
|   result = (__nl_catd) malloc (sizeof (*result));
 | |
|   if (result == NULL)
 | |
|     {
 | |
|       /* We cannot get enough memory.  */
 | |
|       result = (nl_catd) -1;
 | |
|     }
 | |
|   else if (__open_catalog (cat_name, nlspath, env_var, result) != 0)
 | |
|     {
 | |
|       /* Couldn't open the file.  */
 | |
|       free ((void *) result);
 | |
|       result = (nl_catd) -1;
 | |
|     }
 | |
| 
 | |
|   free (tmp);
 | |
|   return (nl_catd) result;
 | |
| }
 | |
| 
 | |
| 
 | |
| /* Return message from message catalog.  */
 | |
| char *
 | |
| catgets (nl_catd catalog_desc, int set, int message, const char *string)
 | |
| {
 | |
|   __nl_catd catalog;
 | |
|   size_t idx;
 | |
|   size_t cnt;
 | |
| 
 | |
|   /* Be generous if catalog which failed to be open is used.  */
 | |
|   if (catalog_desc == (nl_catd) -1 || ++set <= 0 || message < 0)
 | |
|     return (char *) string;
 | |
| 
 | |
|   catalog = (__nl_catd) catalog_desc;
 | |
| 
 | |
|   idx = ((set * message) % catalog->plane_size) * 3;
 | |
|   cnt = 0;
 | |
|   do
 | |
|     {
 | |
|       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;
 | |
|     }
 | |
|   while (++cnt < catalog->plane_depth);
 | |
| 
 | |
|   __set_errno (ENOMSG);
 | |
|   return (char *) string;
 | |
| }
 | |
| 
 | |
| 
 | |
| /* Return resources used for loaded message catalog.  */
 | |
| int
 | |
| catclose (nl_catd catalog_desc)
 | |
| {
 | |
|   __nl_catd catalog;
 | |
| 
 | |
|   /* Be generous if catalog which failed to be open is used.  */
 | |
|   if (catalog_desc == (nl_catd) -1)
 | |
|     {
 | |
|       __set_errno (EBADF);
 | |
|       return -1;
 | |
|     }
 | |
| 
 | |
|   catalog = (__nl_catd) catalog_desc;
 | |
| 
 | |
| #ifdef _POSIX_MAPPED_FILES
 | |
|   if (catalog->status == mmapped)
 | |
|     __munmap ((void *) catalog->file_ptr, catalog->file_size);
 | |
|   else
 | |
| #endif	/* _POSIX_MAPPED_FILES */
 | |
|     if (catalog->status == malloced)
 | |
|       free ((void *) catalog->file_ptr);
 | |
|     else
 | |
|       {
 | |
| 	__set_errno (EBADF);
 | |
| 	return -1;
 | |
|       }
 | |
| 
 | |
|   free ((void *) catalog);
 | |
| 
 | |
|   return 0;
 | |
| }
 |