mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-01 05:33:36 +08:00
9cfe5381a1
* intl/dcigettext.c (_nl_find_msg): Add a cast. * nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR. * nis/nis_clone_obj.c (nis_clone_object): Likewise. * nis/nis_clone_res.c (nis_clone_result): Likewise. * resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char * for END_OF_MESSAGE and CP. * resolv/res_send.c (send_dg): Add else branch for case impossible unless `poll' is buggy. * crypt/crypt_util.c (__setkey_r): Add a cast. * locale/programs/linereader.c (get_toplvl_escape): Use size_t for NBYTES, and unsigned char * for BYTES. * locale/programs/charmap.c (charmap_new_char): Use size_t and unsighed char * for NBYTES, BYTES parameters. * sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument and cast it. * sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise. * sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES. * sunrpc/svcauth_des.c (_svcauth_des): Fix cast type. * sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA. (authdes_marshal): Don't use unsigned int for LEN. * sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2. (xdr_u_hyper): Likewise. (xdr_u_short): Don't use u_long for L. * sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2. * inet/rexec.c (rexec_af): Use socklen_t. * sunrpc/key_call.c (getkeyserv_handle): Likewise. * sunrpc/rtime.c (rtime): Likewise. * resolv/res_send.c (send_vc, send_dg): Likewise. * nis/nis_callback.c (__nis_create_callback): Likewise. * sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr. * sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local. * libio/libio.h (_IO_BE): Add parenthesis around EXPR. * intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed. (_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF. (libc_freeres_fn, DCIGETTEXT): Don't use INTUSE. * intl/bindtextdom.c (INTUSE): Macro removed. (_nl_default_dirname): Use libc_hidden_proto. (set_binding_values): Don't use INTUSE. * include/libintl.h (_libc_intl_domainname_internal): Decl removed. (_libc_intl_domainname): Use libc_hidden_proto. * posix/regex_internal.h (gettext): Remove INTUSE on it. * locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def rather than INTDEF. * include/libintl.h (_): Don't use *_internal name. * ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t, not uint32_t. * locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments. * iconv/gconv_open.c (__gconv_open): Remove useless cast. [BZ #721] * sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside of [RESOLVE_MAP]. * sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rel, elf_machine_rel_relative): Removed. * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rel, elf_machine_rel_relative): Removed. 2005-02-03 Alexandre Oliva <aoliva@redhat.com> [BZ #721] * elf/dynamic-link.h: Don't declare nested auto functions that are not going to be defined. 2004-07-23 Jakub Jelinek <jakub@redhat.com> [BZ #284] * include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined. 2005-02-16 Roland McGrath <roland@redhat.com>
112 lines
4.7 KiB
C
112 lines
4.7 KiB
C
/* Define current locale data for LC_CTYPE category.
|
|
Copyright (C) 1995,1996,1997,1998,1999,2000,2002,2003,2005
|
|
Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include "localeinfo.h"
|
|
#include <ctype.h>
|
|
#include <endian.h>
|
|
#include <stdint.h>
|
|
|
|
_NL_CURRENT_DEFINE (LC_CTYPE);
|
|
|
|
/* We are called after loading LC_CTYPE data to load it into
|
|
the variables used by the ctype.h macros. */
|
|
|
|
|
|
|
|
void
|
|
_nl_postload_ctype (void)
|
|
{
|
|
#define current(type,x,offset) \
|
|
((const type *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_##x) + offset)
|
|
|
|
const union locale_data_value *const ctypes
|
|
= _nl_global_locale.__locales[LC_CTYPE]->values;
|
|
|
|
/* These thread-local variables are defined in ctype-info.c.
|
|
The declarations here must match those in localeinfo.h.
|
|
|
|
These point into arrays of 384, so they can be indexed by any `unsigned
|
|
char' value [0,255]; by EOF (-1); or by any `signed char' value
|
|
[-128,-1). ISO C requires that the ctype functions work for `unsigned
|
|
char' values and for EOF; we also support negative `signed char' values
|
|
for broken old programs. The case conversion arrays are of `int's
|
|
rather than `unsigned char's because tolower (EOF) must be EOF, which
|
|
doesn't fit into an `unsigned char'. But today more important is that
|
|
the arrays are also used for multi-byte character sets.
|
|
|
|
First we update the special members of _nl_global_locale as newlocale
|
|
would. This is necessary for uselocale (LC_GLOBAL_LOCALE) to find these
|
|
values properly. */
|
|
|
|
_nl_global_locale.__ctype_b = (const unsigned short int *)
|
|
ctypes[_NL_ITEM_INDEX (_NL_CTYPE_CLASS)].string + 128;
|
|
_nl_global_locale.__ctype_tolower = (const int *)
|
|
ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER)].string + 128;
|
|
_nl_global_locale.__ctype_toupper = (const int *)
|
|
ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER)].string + 128;
|
|
|
|
/* Next we must set the thread-local caches if and only if this thread is
|
|
in fact using the global locale. */
|
|
if (_NL_CURRENT_LOCALE == &_nl_global_locale)
|
|
{
|
|
__libc_tsd_set (CTYPE_B, (void *) _nl_global_locale.__ctype_b);
|
|
__libc_tsd_set (CTYPE_TOUPPER,
|
|
(void *) _nl_global_locale.__ctype_toupper);
|
|
__libc_tsd_set (CTYPE_TOLOWER,
|
|
(void *) _nl_global_locale.__ctype_tolower);
|
|
}
|
|
|
|
#include <shlib-compat.h>
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3)
|
|
/* We must use the exported names to access these so we are sure to
|
|
be accessing the main executable's copy if it has COPY relocs. */
|
|
|
|
extern __const unsigned short int *__ctype_b; /* Characteristics. */
|
|
extern __const __int32_t *__ctype_tolower; /* Case conversions. */
|
|
extern __const __int32_t *__ctype_toupper; /* Case conversions. */
|
|
|
|
extern const uint32_t *__ctype32_b;
|
|
extern const uint32_t *__ctype32_toupper;
|
|
extern const uint32_t *__ctype32_tolower;
|
|
|
|
/* We need the .symver declarations these macros generate so that
|
|
our references are explicitly bound to the versioned symbol names
|
|
rather than the unadorned names that are not exported. When the
|
|
linker sees these bound to local symbols (as the unexported names are)
|
|
then it doesn't generate a proper relocation to the global symbols.
|
|
We need those relocations so that a versioned definition with a COPY
|
|
reloc in an executable will override the libc.so definition. */
|
|
|
|
compat_symbol (libc, __ctype_b, __ctype_b, GLIBC_2_0);
|
|
compat_symbol (libc, __ctype_tolower, __ctype_tolower, GLIBC_2_0);
|
|
compat_symbol (libc, __ctype_toupper, __ctype_toupper, GLIBC_2_0);
|
|
compat_symbol (libc, __ctype32_b, __ctype32_b, GLIBC_2_0);
|
|
compat_symbol (libc, __ctype32_tolower, __ctype32_tolower, GLIBC_2_2);
|
|
compat_symbol (libc, __ctype32_toupper, __ctype32_toupper, GLIBC_2_2);
|
|
|
|
__ctype_b = current (uint16_t, CLASS, 128);
|
|
__ctype_toupper = current (int32_t, TOUPPER, 128);
|
|
__ctype_tolower = current (int32_t, TOLOWER, 128);
|
|
__ctype32_b = current (uint32_t, CLASS32, 0);
|
|
__ctype32_toupper = current (uint32_t, TOUPPER32, 0);
|
|
__ctype32_tolower = current (uint32_t, TOLOWER32, 0);
|
|
#endif
|
|
}
|