mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
ec999b8e5e
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/libc-lock.h to plain libc-lock.h and bits/libc-lockP.h to plain libc-lockP.h to follow that convention. Note that I don't know where libc-lockP.h comes from for Hurd (the Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in the glibc source tree is for NPTL) - some unmerged patch? - but I updated the #include in the Hurd libc-lock.h anyway. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/libc-lock.h: Move to ... * sysdeps/generic/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... * sysdeps/mach/hurd/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. * sysdeps/mach/bits/libc-lock.h: Move to ... * sysdeps/mach/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lock.h: Move to ... * sysdeps/nptl/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lockP.h: Move to ... * sysdeps/nptl/libc-lockP.h: ...here. (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. * crypt/crypt_util.c: Include <libc-lock.h> instead of <bits/libc-lock.h>. * dirent/scandir-tail.c: Likewise. * dlfcn/dlerror.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-writev.h: Likewise. * elf/rtld.c: Likewise. * grp/fgetgrent.c: Likewise. * gshadow/fgetsgent.c: Likewise. * gshadow/sgetsgent.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_trans.c: Likewise. * include/link.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent.c: Likewise. * inet/getnetgrent_r.c: Likewise. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/utmp-private.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * misc/efgcvt.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/mntent.c: Likewise. * misc/syslog.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nss-default.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-initgroups.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nptl/libc_pthread_init.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/nss_db.h: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/regex_internal.h: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_libc.c: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * socket/opensock.c: Likewise. * stdio-common/reg-modifier.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/reg-type.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/abort.c: Likewise. * stdlib/cxa_atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * stdlib/setenv.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sysdeps/arm/backtrace.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/stdio-lock.h: Likewise. * sysdeps/generic/unwind-dw2-fde.c: Likewise. * sysdeps/i386/backtrace.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. * sysdeps/m68k/backtrace.c: Likewise. * sysdeps/mach/hurd/cthreads.c: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/malloc-machine.h: Likewise. * sysdeps/nptl/malloc-machine.h: Likewise. * sysdeps/nptl/stdio-lock.h: Likewise. * sysdeps/posix/dirstream.h: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/pthread/aio_suspend.c: Likewise. * sysdeps/s390/s390-32/backtrace.c: Likewise. * sysdeps/s390/s390-64/backtrace.c: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/x86_64/backtrace.c: Likewise. * time/alt_digit.c: Likewise. * time/era.c: Likewise. * time/tzset.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> instead of <bits/libc-lock.h> in comment.
311 lines
9.8 KiB
C
311 lines
9.8 KiB
C
/* Header describing internals of libintl library.
|
|
Copyright (C) 1995-2015 Free Software Foundation, Inc.
|
|
Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
|
|
|
|
This program 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.
|
|
|
|
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _GETTEXTP_H
|
|
#define _GETTEXTP_H
|
|
|
|
#include <stddef.h> /* Get size_t. */
|
|
|
|
#ifdef _LIBC
|
|
# include "../iconv/gconv_int.h"
|
|
#else
|
|
# if HAVE_ICONV
|
|
# include <iconv.h>
|
|
# endif
|
|
#endif
|
|
|
|
/* Handle multi-threaded applications. */
|
|
#ifdef _LIBC
|
|
# include <libc-lock.h>
|
|
# define gl_rwlock_define __libc_rwlock_define
|
|
#else
|
|
# include "lock.h"
|
|
#endif
|
|
|
|
#ifdef _LIBC
|
|
struct loaded_domain;
|
|
extern char *__gettext (const char *__msgid);
|
|
extern char *__dgettext (const char *__domainname, const char *__msgid);
|
|
extern char *__dcgettext (const char *__domainname, const char *__msgid,
|
|
int __category);
|
|
extern char *__ngettext (const char *__msgid1, const char *__msgid2,
|
|
unsigned long int __n);
|
|
extern char *__dngettext (const char *__domainname,
|
|
const char *__msgid1, const char *__msgid2,
|
|
unsigned long int n);
|
|
extern char *__dcngettext (const char *__domainname,
|
|
const char *__msgid1, const char *__msgid2,
|
|
unsigned long int __n, int __category);
|
|
extern char *__dcigettext (const char *__domainname,
|
|
const char *__msgid1, const char *__msgid2,
|
|
int __plural, unsigned long int __n,
|
|
int __category);
|
|
extern char *__textdomain (const char *__domainname);
|
|
extern char *__bindtextdomain (const char *__domainname,
|
|
const char *__dirname);
|
|
extern char *__bind_textdomain_codeset (const char *__domainname,
|
|
const char *__codeset);
|
|
extern void _nl_finddomain_subfreeres (void) attribute_hidden;
|
|
extern void _nl_unload_domain (struct loaded_domain *__domain)
|
|
internal_function attribute_hidden;
|
|
#else
|
|
/* Declare the exported libintl_* functions, in a way that allows us to
|
|
call them under their real name. */
|
|
# undef _INTL_REDIRECT_INLINE
|
|
# undef _INTL_REDIRECT_MACROS
|
|
# define _INTL_REDIRECT_MACROS
|
|
# include "libgnuintl.h"
|
|
# ifdef IN_LIBGLOCALE
|
|
extern char *gl_dcigettext (const char *__domainname,
|
|
const char *__msgid1, const char *__msgid2,
|
|
int __plural, unsigned long int __n,
|
|
int __category,
|
|
const char *__localename, const char *__encoding);
|
|
# else
|
|
extern char *libintl_dcigettext (const char *__domainname,
|
|
const char *__msgid1, const char *__msgid2,
|
|
int __plural, unsigned long int __n,
|
|
int __category);
|
|
# endif
|
|
#endif
|
|
|
|
#include "loadinfo.h"
|
|
|
|
#include "gmo.h" /* Get nls_uint32. */
|
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
#ifndef internal_function
|
|
# define internal_function
|
|
#endif
|
|
|
|
#ifndef attribute_hidden
|
|
# define attribute_hidden
|
|
#endif
|
|
|
|
/* Tell the compiler when a conditional or integer expression is
|
|
almost always true or almost always false. */
|
|
#ifndef HAVE_BUILTIN_EXPECT
|
|
# define __builtin_expect(expr, val) (expr)
|
|
#endif
|
|
|
|
#ifndef W
|
|
# define W(flag, data) ((flag) ? SWAP (data) : (data))
|
|
#endif
|
|
|
|
|
|
#ifdef _LIBC
|
|
# include <byteswap.h>
|
|
# define SWAP(i) bswap_32 (i)
|
|
#else
|
|
static inline nls_uint32
|
|
# ifdef __cplusplus
|
|
SWAP (nls_uint32 i)
|
|
# else
|
|
SWAP (i)
|
|
nls_uint32 i;
|
|
# endif
|
|
{
|
|
return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
|
|
}
|
|
#endif
|
|
|
|
|
|
/* In-memory representation of system dependent string. */
|
|
struct sysdep_string_desc
|
|
{
|
|
/* Length of addressed string, including the trailing NUL. */
|
|
size_t length;
|
|
/* Pointer to addressed string. */
|
|
const char *pointer;
|
|
};
|
|
|
|
/* Cache of translated strings after charset conversion.
|
|
Note: The strings are converted to the target encoding only on an as-needed
|
|
basis. */
|
|
struct converted_domain
|
|
{
|
|
/* The target encoding name. */
|
|
const char *encoding;
|
|
/* The descriptor for conversion from the message catalog's encoding to
|
|
this target encoding. */
|
|
#ifdef _LIBC
|
|
__gconv_t conv;
|
|
#else
|
|
# if HAVE_ICONV
|
|
iconv_t conv;
|
|
# endif
|
|
#endif
|
|
/* The table of translated strings after charset conversion. */
|
|
char **conv_tab;
|
|
};
|
|
|
|
/* The representation of an opened message catalog. */
|
|
struct loaded_domain
|
|
{
|
|
/* Pointer to memory containing the .mo file. */
|
|
const char *data;
|
|
/* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */
|
|
int use_mmap;
|
|
/* Size of mmap()ed memory. */
|
|
size_t mmap_size;
|
|
/* 1 if the .mo file uses a different endianness than this machine. */
|
|
int must_swap;
|
|
/* Pointer to additional malloc()ed memory. */
|
|
void *malloced;
|
|
|
|
/* Number of static strings pairs. */
|
|
nls_uint32 nstrings;
|
|
/* Pointer to descriptors of original strings in the file. */
|
|
const struct string_desc *orig_tab;
|
|
/* Pointer to descriptors of translated strings in the file. */
|
|
const struct string_desc *trans_tab;
|
|
|
|
/* Number of system dependent strings pairs. */
|
|
nls_uint32 n_sysdep_strings;
|
|
/* Pointer to descriptors of original sysdep strings. */
|
|
const struct sysdep_string_desc *orig_sysdep_tab;
|
|
/* Pointer to descriptors of translated sysdep strings. */
|
|
const struct sysdep_string_desc *trans_sysdep_tab;
|
|
|
|
/* Size of hash table. */
|
|
nls_uint32 hash_size;
|
|
/* Pointer to hash table. */
|
|
const nls_uint32 *hash_tab;
|
|
/* 1 if the hash table uses a different endianness than this machine. */
|
|
int must_swap_hash_tab;
|
|
|
|
/* Cache of charset conversions of the translated strings. */
|
|
struct converted_domain *conversions;
|
|
size_t nconversions;
|
|
gl_rwlock_define (, conversions_lock)
|
|
|
|
const struct expression *plural;
|
|
unsigned long int nplurals;
|
|
};
|
|
|
|
/* We want to allocate a string at the end of the struct. But ISO C
|
|
doesn't allow zero sized arrays. */
|
|
#ifdef __GNUC__
|
|
# define ZERO 0
|
|
#else
|
|
# define ZERO 1
|
|
#endif
|
|
|
|
/* A set of settings bound to a message domain. Used to store settings
|
|
from bindtextdomain() and bind_textdomain_codeset(). */
|
|
struct binding
|
|
{
|
|
struct binding *next;
|
|
char *dirname;
|
|
char *codeset;
|
|
char domainname[ZERO];
|
|
};
|
|
|
|
/* A counter which is incremented each time some previous translations
|
|
become invalid.
|
|
This variable is part of the external ABI of the GNU libintl. */
|
|
#ifdef IN_LIBGLOCALE
|
|
# include <glocale/config.h>
|
|
extern LIBGLOCALE_DLL_EXPORTED int _nl_msg_cat_cntr;
|
|
#else
|
|
extern LIBINTL_DLL_EXPORTED int _nl_msg_cat_cntr;
|
|
#endif
|
|
|
|
#ifndef _LIBC
|
|
extern const char *_nl_language_preferences_default (void);
|
|
# define gl_locale_name_canonicalize _nl_locale_name_canonicalize
|
|
extern void _nl_locale_name_canonicalize (char *name);
|
|
# define gl_locale_name_from_win32_LANGID _nl_locale_name_from_win32_LANGID
|
|
/* extern const char *_nl_locale_name_from_win32_LANGID (LANGID langid); */
|
|
# define gl_locale_name_from_win32_LCID _nl_locale_name_from_win32_LCID
|
|
/* extern const char *_nl_locale_name_from_win32_LCID (LCID lcid); */
|
|
# define gl_locale_name_thread_unsafe _nl_locale_name_thread_unsafe
|
|
extern const char *_nl_locale_name_thread_unsafe (int category,
|
|
const char *categoryname);
|
|
# define gl_locale_name_thread _nl_locale_name_thread
|
|
/* extern const char *_nl_locale_name_thread (int category,
|
|
const char *categoryname); */
|
|
# define gl_locale_name_posix _nl_locale_name_posix
|
|
extern const char *_nl_locale_name_posix (int category,
|
|
const char *categoryname);
|
|
# define gl_locale_name_environ _nl_locale_name_environ
|
|
extern const char *_nl_locale_name_environ (int category,
|
|
const char *categoryname);
|
|
# define gl_locale_name_default _nl_locale_name_default
|
|
extern const char *_nl_locale_name_default (void);
|
|
# define gl_locale_name _nl_locale_name
|
|
/* extern const char *_nl_locale_name (int category,
|
|
const char *categoryname); */
|
|
#endif
|
|
|
|
struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
|
|
const char *__domainname,
|
|
struct binding *__domainbinding)
|
|
internal_function;
|
|
void _nl_load_domain (struct loaded_l10nfile *__domain,
|
|
struct binding *__domainbinding)
|
|
internal_function;
|
|
|
|
#ifdef IN_LIBGLOCALE
|
|
char *_nl_find_msg (struct loaded_l10nfile *domain_file,
|
|
struct binding *domainbinding, const char *encoding,
|
|
const char *msgid,
|
|
size_t *lengthp)
|
|
internal_function;
|
|
#else
|
|
char *_nl_find_msg (struct loaded_l10nfile *domain_file,
|
|
struct binding *domainbinding, const char *msgid,
|
|
int convert, size_t *lengthp)
|
|
internal_function;
|
|
#endif
|
|
|
|
/* The internal variables in the standalone libintl.a must have different
|
|
names than the internal variables in GNU libc, otherwise programs
|
|
using libintl.a cannot be linked statically. */
|
|
#if !defined _LIBC
|
|
# define _nl_default_dirname libintl_nl_default_dirname
|
|
# define _nl_domain_bindings libintl_nl_domain_bindings
|
|
#endif
|
|
|
|
/* Contains the default location of the message catalogs. */
|
|
extern const char _nl_default_dirname[];
|
|
#ifdef _LIBC
|
|
libc_hidden_proto (_nl_default_dirname)
|
|
#endif
|
|
|
|
/* List with bindings of specific domains. */
|
|
extern struct binding *_nl_domain_bindings;
|
|
|
|
/* The internal variables in the standalone libintl.a must have different
|
|
names than the internal variables in GNU libc, otherwise programs
|
|
using libintl.a cannot be linked statically. */
|
|
#if !defined _LIBC
|
|
# define _nl_default_default_domain libintl_nl_default_default_domain
|
|
# define _nl_current_default_domain libintl_nl_current_default_domain
|
|
#endif
|
|
|
|
/* Name of the default text domain. */
|
|
extern const char _nl_default_default_domain[] attribute_hidden;
|
|
|
|
/* Default text domain in which entries for gettext(3) are to be found. */
|
|
extern const char *_nl_current_default_domain attribute_hidden;
|
|
|
|
/* @@ begin of epilog @@ */
|
|
|
|
#endif /* gettextP.h */
|