mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
iconv, intl, locale, wcsmbs: Remove internal_function
Also adjust parts of the time subdirectory.
This commit is contained in:
parent
dab0eecef6
commit
d7ccc6c983
66
ChangeLog
66
ChangeLog
@ -1,3 +1,69 @@
|
|||||||
|
2017-08-31 Florian Weimer <fweimer@redhat.com>
|
||||||
|
|
||||||
|
* iconv/gconv.c (__gconv): Remove internal_function.
|
||||||
|
* iconv/gconv_builtin.c (__gconv_get_builtin_trans): Likewise.
|
||||||
|
* iconv/gconv_cache.c (__gconv_load_cache, find_module_idx)
|
||||||
|
(find_module, __gconv_compare_alias_cache, __gconv_lookup_cache)
|
||||||
|
(__gconv_release_cache): Likewise.
|
||||||
|
* iconv/gconv_close.c (__gconv_close): Likewise.
|
||||||
|
* iconv/gconv_conf.c (detect_conflict, insert_module, add_module)
|
||||||
|
(read_conf_file, __gconv_get_path): Likewise.
|
||||||
|
* iconv/gconv_db.c (derivation_lookup, add_derivation)
|
||||||
|
(__gconv_release_step, gen_steps, increment_counter)
|
||||||
|
(find_derivation, __gconv_compare_alias, __gconv_find_transform)
|
||||||
|
(__gconv_close_transform, free_modules_db): Likewise.
|
||||||
|
* iconv/gconv_dl.c (__gconv_find_shlib, __gconv_release_shlib):
|
||||||
|
Likewise.
|
||||||
|
* iconv/gconv_int.h (__gconv_open, __gconv_close, __gconv)
|
||||||
|
(__gconv_find_transform, __gconv_lookup_cache)
|
||||||
|
(__gconv_release_step, __gconv_load_cache, __gconv_get_path)
|
||||||
|
(__gconv_close_transform, __gconv_release_cache)
|
||||||
|
(__gconv_loaded_object, __gconv_release_shlib)
|
||||||
|
(__gconv_compare_alias): Likewise.
|
||||||
|
* iconv/gconv_open.c (__gconv_open): Likewise.
|
||||||
|
* iconv/iconv_prog.c (print_known_names, add_known_names): Likewise.
|
||||||
|
* iconv/iconvconfig.c (add_module): Likewise.
|
||||||
|
* intl/dcigettext.c (plural_lookup, guess_category_value)
|
||||||
|
(category_to_name, get_output_charset, _nl_find_msg): Likewise.
|
||||||
|
* intl/eval-plural.h (plural_eval): Likewise.
|
||||||
|
* intl/finddomain.c (_nl_find_domain): Likewise.
|
||||||
|
* intl/gettextP.h (_nl_unload_domain, _nl_find_domain)
|
||||||
|
(_nl_load_domain, _nl_find_msg): Likewise.
|
||||||
|
(internal_function): Remove definition.
|
||||||
|
* intl/loadinfo.h (internal_function): Likewise.
|
||||||
|
* intl/loadmsgcat.c (_nl_load_domain, _nl_unload_domain): Remove
|
||||||
|
internal_function.
|
||||||
|
* intl/localealias.c (internal_function): Remove definition.
|
||||||
|
(read_alias_file): Remove internal_function.
|
||||||
|
* intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Likewise.
|
||||||
|
* intl/plural-exp.h (internal_function): Remove definition.
|
||||||
|
(FREE_EXPRESSION, EXTRACT_PLURAL_EXPRESSION): Remove
|
||||||
|
internal_function.
|
||||||
|
* intl/plural.c: Regenerate.
|
||||||
|
* intl/plural.y (FREE_EXPRESSION): Remove internal_function.
|
||||||
|
* locale/coll-lookup.c (__collidx_table_lookup)
|
||||||
|
(__collseq_table_lookup): Likewise.
|
||||||
|
* locale/coll-lookup.h (__collidx_table_lookup)
|
||||||
|
(__collseq_table_lookup): Likewise.
|
||||||
|
* locale/findlocale.c (_nl_find_locale, _nl_remove_locale): Likewise.
|
||||||
|
* locale/loadarchive.c (_nl_load_locale_from_archive): Likewise.
|
||||||
|
* locale/loadlocale.c (_nl_intern_locale_data, _nl_load_locale)
|
||||||
|
(_nl_unload_locale): Likewise.
|
||||||
|
* locale/localeinfo.h (struct __locale_data): Remove
|
||||||
|
internal_function from cleanup member.
|
||||||
|
(_nl_find_locale, _nl_load_locale, _nl_unload_locale)
|
||||||
|
(_nl_remove_locale, _nl_load_locale_from_archive)
|
||||||
|
(_nl_intern_locale_data, _nl_get_era_entry, _nl_select_era_entry)
|
||||||
|
(_nl_get_alt_digit, _nl_get_walt_digit, _nl_parse_alt_digit)
|
||||||
|
(_nl_cleanup_time): Remove internal_function.
|
||||||
|
* time/alt_digit.c (_nl_get_alt_digit, _nl_get_walt_digit)
|
||||||
|
(_nl_parse_alt_digit): Likewise.
|
||||||
|
* time/era.c (_nl_init_era_entries, _nl_get_era_entry)
|
||||||
|
(_nl_select_era_entry): Likewise.
|
||||||
|
* time/lc-time-cleanup.c (_nl_cleanup_time): Likewise.
|
||||||
|
* wcsmbs/wcsmbsload.c (__wcsmbs_load_conv, __wcsmbs_clone_conv)
|
||||||
|
(__wcsmbs_named_conv, _nl_cleanup_ctype): Likewise.
|
||||||
|
|
||||||
2017-08-31 Florian Weimer <fweimer@redhat.com>
|
2017-08-31 Florian Weimer <fweimer@redhat.com>
|
||||||
|
|
||||||
* rt/aio_sigqueue.c (__aio_sigqueue): Remove internal_function.
|
* rt/aio_sigqueue.c (__aio_sigqueue): Remove internal_function.
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
__gconv (__gconv_t cd, const unsigned char **inbuf,
|
__gconv (__gconv_t cd, const unsigned char **inbuf,
|
||||||
const unsigned char *inbufend, unsigned char **outbuf,
|
const unsigned char *inbufend, unsigned char **outbuf,
|
||||||
unsigned char *outbufend, size_t *irreversible)
|
unsigned char *outbufend, size_t *irreversible)
|
||||||
|
@ -59,7 +59,6 @@ static const struct builtin_map
|
|||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
__gconv_get_builtin_trans (const char *name, struct __gconv_step *step)
|
__gconv_get_builtin_trans (const char *name, struct __gconv_step *step)
|
||||||
{
|
{
|
||||||
size_t cnt;
|
size_t cnt;
|
||||||
|
@ -45,7 +45,6 @@ __gconv_get_cache (void)
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
__gconv_load_cache (void)
|
__gconv_load_cache (void)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
@ -142,7 +141,6 @@ __gconv_load_cache (void)
|
|||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
internal_function
|
|
||||||
find_module_idx (const char *str, size_t *idxp)
|
find_module_idx (const char *str, size_t *idxp)
|
||||||
{
|
{
|
||||||
unsigned int idx;
|
unsigned int idx;
|
||||||
@ -181,7 +179,6 @@ find_module_idx (const char *str, size_t *idxp)
|
|||||||
|
|
||||||
#ifndef STATIC_GCONV
|
#ifndef STATIC_GCONV
|
||||||
static int
|
static int
|
||||||
internal_function
|
|
||||||
find_module (const char *directory, const char *filename,
|
find_module (const char *directory, const char *filename,
|
||||||
struct __gconv_step *result)
|
struct __gconv_step *result)
|
||||||
{
|
{
|
||||||
@ -227,7 +224,6 @@ find_module (const char *directory, const char *filename,
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
__gconv_compare_alias_cache (const char *name1, const char *name2, int *result)
|
__gconv_compare_alias_cache (const char *name1, const char *name2, int *result)
|
||||||
{
|
{
|
||||||
size_t name1_idx;
|
size_t name1_idx;
|
||||||
@ -247,7 +243,6 @@ __gconv_compare_alias_cache (const char *name1, const char *name2, int *result)
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
__gconv_lookup_cache (const char *toset, const char *fromset,
|
__gconv_lookup_cache (const char *toset, const char *fromset,
|
||||||
struct __gconv_step **handle, size_t *nsteps, int flags)
|
struct __gconv_step **handle, size_t *nsteps, int flags)
|
||||||
{
|
{
|
||||||
@ -449,7 +444,6 @@ __gconv_lookup_cache (const char *toset, const char *fromset,
|
|||||||
|
|
||||||
/* Free memory allocated for the transformation record. */
|
/* Free memory allocated for the transformation record. */
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
__gconv_release_cache (struct __gconv_step *steps, size_t nsteps)
|
__gconv_release_cache (struct __gconv_step *steps, size_t nsteps)
|
||||||
{
|
{
|
||||||
if (gconv_cache != NULL)
|
if (gconv_cache != NULL)
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
__gconv_close (__gconv_t cd)
|
__gconv_close (__gconv_t cd)
|
||||||
{
|
{
|
||||||
struct __gconv_step *srunp;
|
struct __gconv_step *srunp;
|
||||||
|
@ -99,7 +99,6 @@ const char *__gconv_path_envvar;
|
|||||||
|
|
||||||
/* Test whether there is already a matching module known. */
|
/* Test whether there is already a matching module known. */
|
||||||
static int
|
static int
|
||||||
internal_function
|
|
||||||
detect_conflict (const char *alias)
|
detect_conflict (const char *alias)
|
||||||
{
|
{
|
||||||
struct gconv_module *node = __gconv_modules_db;
|
struct gconv_module *node = __gconv_modules_db;
|
||||||
@ -183,7 +182,6 @@ add_alias (char *rp, void *modules)
|
|||||||
|
|
||||||
/* Insert a data structure for a new module in the search tree. */
|
/* Insert a data structure for a new module in the search tree. */
|
||||||
static void
|
static void
|
||||||
internal_function
|
|
||||||
insert_module (struct gconv_module *newp, int tobefreed)
|
insert_module (struct gconv_module *newp, int tobefreed)
|
||||||
{
|
{
|
||||||
struct gconv_module **rootp = &__gconv_modules_db;
|
struct gconv_module **rootp = &__gconv_modules_db;
|
||||||
@ -242,7 +240,6 @@ insert_module (struct gconv_module *newp, int tobefreed)
|
|||||||
|
|
||||||
/* Add new module. */
|
/* Add new module. */
|
||||||
static void
|
static void
|
||||||
internal_function
|
|
||||||
add_module (char *rp, const char *directory, size_t dir_len, void **modules,
|
add_module (char *rp, const char *directory, size_t dir_len, void **modules,
|
||||||
size_t *nmodules, int modcounter)
|
size_t *nmodules, int modcounter)
|
||||||
{
|
{
|
||||||
@ -357,7 +354,6 @@ add_module (char *rp, const char *directory, size_t dir_len, void **modules,
|
|||||||
|
|
||||||
/* Read the next configuration file. */
|
/* Read the next configuration file. */
|
||||||
static void
|
static void
|
||||||
internal_function
|
|
||||||
read_conf_file (const char *filename, const char *directory, size_t dir_len,
|
read_conf_file (const char *filename, const char *directory, size_t dir_len,
|
||||||
void **modules, size_t *nmodules)
|
void **modules, size_t *nmodules)
|
||||||
{
|
{
|
||||||
@ -425,7 +421,6 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len,
|
|||||||
|
|
||||||
/* Determine the directories we are looking for data in. */
|
/* Determine the directories we are looking for data in. */
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
__gconv_get_path (void)
|
__gconv_get_path (void)
|
||||||
{
|
{
|
||||||
struct path_elem *result;
|
struct path_elem *result;
|
||||||
|
@ -121,7 +121,6 @@ static void *known_derivations;
|
|||||||
|
|
||||||
/* Look up whether given transformation was already requested before. */
|
/* Look up whether given transformation was already requested before. */
|
||||||
static int
|
static int
|
||||||
internal_function
|
|
||||||
derivation_lookup (const char *fromset, const char *toset,
|
derivation_lookup (const char *fromset, const char *toset,
|
||||||
struct __gconv_step **handle, size_t *nsteps)
|
struct __gconv_step **handle, size_t *nsteps)
|
||||||
{
|
{
|
||||||
@ -143,7 +142,6 @@ derivation_lookup (const char *fromset, const char *toset,
|
|||||||
|
|
||||||
/* Add new derivation to list of known ones. */
|
/* Add new derivation to list of known ones. */
|
||||||
static void
|
static void
|
||||||
internal_function
|
|
||||||
add_derivation (const char *fromset, const char *toset,
|
add_derivation (const char *fromset, const char *toset,
|
||||||
struct __gconv_step *handle, size_t nsteps)
|
struct __gconv_step *handle, size_t nsteps)
|
||||||
{
|
{
|
||||||
@ -204,7 +202,6 @@ free_derivation (void *p)
|
|||||||
|
|
||||||
/* Decrement the reference count for a single step in a steps array. */
|
/* Decrement the reference count for a single step in a steps array. */
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
__gconv_release_step (struct __gconv_step *step)
|
__gconv_release_step (struct __gconv_step *step)
|
||||||
{
|
{
|
||||||
/* Skip builtin modules; they are not reference counted. */
|
/* Skip builtin modules; they are not reference counted. */
|
||||||
@ -230,7 +227,6 @@ __gconv_release_step (struct __gconv_step *step)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
internal_function
|
|
||||||
gen_steps (struct derivation_step *best, const char *toset,
|
gen_steps (struct derivation_step *best, const char *toset,
|
||||||
const char *fromset, struct __gconv_step **handle, size_t *nsteps)
|
const char *fromset, struct __gconv_step **handle, size_t *nsteps)
|
||||||
{
|
{
|
||||||
@ -370,7 +366,6 @@ gen_steps (struct derivation_step *best, const char *toset,
|
|||||||
|
|
||||||
#ifndef STATIC_GCONV
|
#ifndef STATIC_GCONV
|
||||||
static int
|
static int
|
||||||
internal_function
|
|
||||||
increment_counter (struct __gconv_step *steps, size_t nsteps)
|
increment_counter (struct __gconv_step *steps, size_t nsteps)
|
||||||
{
|
{
|
||||||
/* Increment the user counter. */
|
/* Increment the user counter. */
|
||||||
@ -430,7 +425,6 @@ increment_counter (struct __gconv_step *steps, size_t nsteps)
|
|||||||
/* The main function: find a possible derivation from the `fromset' (either
|
/* The main function: find a possible derivation from the `fromset' (either
|
||||||
the given name or the alias) to the `toset' (again with alias). */
|
the given name or the alias) to the `toset' (again with alias). */
|
||||||
static int
|
static int
|
||||||
internal_function
|
|
||||||
find_derivation (const char *toset, const char *toset_expand,
|
find_derivation (const char *toset, const char *toset_expand,
|
||||||
const char *fromset, const char *fromset_expand,
|
const char *fromset, const char *fromset_expand,
|
||||||
struct __gconv_step **handle, size_t *nsteps)
|
struct __gconv_step **handle, size_t *nsteps)
|
||||||
@ -710,7 +704,6 @@ do_lookup_alias (const char *name)
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
__gconv_compare_alias (const char *name1, const char *name2)
|
__gconv_compare_alias (const char *name1, const char *name2)
|
||||||
{
|
{
|
||||||
int result;
|
int result;
|
||||||
@ -727,7 +720,6 @@ __gconv_compare_alias (const char *name1, const char *name2)
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
__gconv_find_transform (const char *toset, const char *fromset,
|
__gconv_find_transform (const char *toset, const char *fromset,
|
||||||
struct __gconv_step **handle, size_t *nsteps,
|
struct __gconv_step **handle, size_t *nsteps,
|
||||||
int flags)
|
int flags)
|
||||||
@ -793,7 +785,6 @@ __gconv_find_transform (const char *toset, const char *fromset,
|
|||||||
|
|
||||||
/* Release the entries of the modules list. */
|
/* Release the entries of the modules list. */
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
__gconv_close_transform (struct __gconv_step *steps, size_t nsteps)
|
__gconv_close_transform (struct __gconv_step *steps, size_t nsteps)
|
||||||
{
|
{
|
||||||
int result = __GCONV_OK;
|
int result = __GCONV_OK;
|
||||||
@ -822,7 +813,7 @@ __gconv_close_transform (struct __gconv_step *steps, size_t nsteps)
|
|||||||
|
|
||||||
/* Free the modules mentioned. */
|
/* Free the modules mentioned. */
|
||||||
static void
|
static void
|
||||||
internal_function __libc_freeres_fn_section
|
__libc_freeres_fn_section
|
||||||
free_modules_db (struct gconv_module *node)
|
free_modules_db (struct gconv_module *node)
|
||||||
{
|
{
|
||||||
if (node->left != NULL)
|
if (node->left != NULL)
|
||||||
|
@ -64,7 +64,6 @@ known_compare (const void *p1, const void *p2)
|
|||||||
/* Open the gconv database if necessary. A non-negative return value
|
/* Open the gconv database if necessary. A non-negative return value
|
||||||
means success. */
|
means success. */
|
||||||
struct __gconv_loaded_object *
|
struct __gconv_loaded_object *
|
||||||
internal_function
|
|
||||||
__gconv_find_shlib (const char *name)
|
__gconv_find_shlib (const char *name)
|
||||||
{
|
{
|
||||||
struct __gconv_loaded_object *found;
|
struct __gconv_loaded_object *found;
|
||||||
@ -183,7 +182,6 @@ do_release_shlib (void *nodep, VISIT value, int level)
|
|||||||
|
|
||||||
/* Notify system that a shared object is not longer needed. */
|
/* Notify system that a shared object is not longer needed. */
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
__gconv_release_shlib (struct __gconv_loaded_object *handle)
|
__gconv_release_shlib (struct __gconv_loaded_object *handle)
|
||||||
{
|
{
|
||||||
/* Urgh, this is ugly but we have no other possibility. */
|
/* Urgh, this is ugly but we have no other possibility. */
|
||||||
|
@ -156,12 +156,10 @@ __libc_lock_define (extern, __gconv_lock attribute_hidden)
|
|||||||
|
|
||||||
/* Return in *HANDLE decriptor for transformation from FROMSET to TOSET. */
|
/* Return in *HANDLE decriptor for transformation from FROMSET to TOSET. */
|
||||||
extern int __gconv_open (const char *toset, const char *fromset,
|
extern int __gconv_open (const char *toset, const char *fromset,
|
||||||
__gconv_t *handle, int flags)
|
__gconv_t *handle, int flags);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Free resources associated with transformation descriptor CD. */
|
/* Free resources associated with transformation descriptor CD. */
|
||||||
extern int __gconv_close (__gconv_t cd)
|
extern int __gconv_close (__gconv_t cd);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF
|
/* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF
|
||||||
according to rules described by CD and place up to *OUTBYTESLEFT
|
according to rules described by CD and place up to *OUTBYTESLEFT
|
||||||
@ -169,37 +167,33 @@ extern int __gconv_close (__gconv_t cd)
|
|||||||
conversions in *IRREVERSIBLE if this pointer is not null. */
|
conversions in *IRREVERSIBLE if this pointer is not null. */
|
||||||
extern int __gconv (__gconv_t cd, const unsigned char **inbuf,
|
extern int __gconv (__gconv_t cd, const unsigned char **inbuf,
|
||||||
const unsigned char *inbufend, unsigned char **outbuf,
|
const unsigned char *inbufend, unsigned char **outbuf,
|
||||||
unsigned char *outbufend, size_t *irreversible)
|
unsigned char *outbufend, size_t *irreversible);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Return in *HANDLE a pointer to an array with *NSTEPS elements describing
|
/* Return in *HANDLE a pointer to an array with *NSTEPS elements describing
|
||||||
the single steps necessary for transformation from FROMSET to TOSET. */
|
the single steps necessary for transformation from FROMSET to TOSET. */
|
||||||
extern int __gconv_find_transform (const char *toset, const char *fromset,
|
extern int __gconv_find_transform (const char *toset, const char *fromset,
|
||||||
struct __gconv_step **handle,
|
struct __gconv_step **handle,
|
||||||
size_t *nsteps, int flags)
|
size_t *nsteps, int flags);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Search for transformation in cache data. */
|
/* Search for transformation in cache data. */
|
||||||
extern int __gconv_lookup_cache (const char *toset, const char *fromset,
|
extern int __gconv_lookup_cache (const char *toset, const char *fromset,
|
||||||
struct __gconv_step **handle, size_t *nsteps,
|
struct __gconv_step **handle, size_t *nsteps,
|
||||||
int flags)
|
int flags);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Compare the two name for whether they are after alias expansion the
|
/* Compare the two name for whether they are after alias expansion the
|
||||||
same. This function uses the cache and fails if none is
|
same. This function uses the cache and fails if none is
|
||||||
loaded. */
|
loaded. */
|
||||||
extern int __gconv_compare_alias_cache (const char *name1, const char *name2,
|
extern int __gconv_compare_alias_cache (const char *name1, const char *name2,
|
||||||
int *result) internal_function;
|
int *result);
|
||||||
|
|
||||||
/* Free data associated with a step's structure. */
|
/* Free data associated with a step's structure. */
|
||||||
extern void __gconv_release_step (struct __gconv_step *step)
|
extern void __gconv_release_step (struct __gconv_step *step);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Read all the configuration data and cache it. */
|
/* Read all the configuration data and cache it. */
|
||||||
extern void __gconv_read_conf (void) attribute_hidden;
|
extern void __gconv_read_conf (void) attribute_hidden;
|
||||||
|
|
||||||
/* Try to read module cache file. */
|
/* Try to read module cache file. */
|
||||||
extern int __gconv_load_cache (void) internal_function;
|
extern int __gconv_load_cache (void);
|
||||||
|
|
||||||
/* Retrieve pointer to internal cache. */
|
/* Retrieve pointer to internal cache. */
|
||||||
extern void *__gconv_get_cache (void);
|
extern void *__gconv_get_cache (void);
|
||||||
@ -211,7 +205,7 @@ extern struct gconv_module *__gconv_get_modules_db (void);
|
|||||||
extern void *__gconv_get_alias_db (void);
|
extern void *__gconv_get_alias_db (void);
|
||||||
|
|
||||||
/* Determine the directories we are looking in. */
|
/* Determine the directories we are looking in. */
|
||||||
extern void __gconv_get_path (void) internal_function;
|
extern void __gconv_get_path (void);
|
||||||
|
|
||||||
/* Comparison function to search alias. */
|
/* Comparison function to search alias. */
|
||||||
extern int __gconv_alias_compare (const void *p1, const void *p2)
|
extern int __gconv_alias_compare (const void *p1, const void *p2)
|
||||||
@ -220,34 +214,28 @@ extern int __gconv_alias_compare (const void *p1, const void *p2)
|
|||||||
/* Clear reference to transformation step implementations which might
|
/* Clear reference to transformation step implementations which might
|
||||||
cause the code to be unloaded. */
|
cause the code to be unloaded. */
|
||||||
extern int __gconv_close_transform (struct __gconv_step *steps,
|
extern int __gconv_close_transform (struct __gconv_step *steps,
|
||||||
size_t nsteps)
|
size_t nsteps);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Free all resources allocated for the transformation record when
|
/* Free all resources allocated for the transformation record when
|
||||||
using the cache. */
|
using the cache. */
|
||||||
extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps)
|
extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Load shared object named by NAME. If already loaded increment reference
|
/* Load shared object named by NAME. If already loaded increment reference
|
||||||
count. */
|
count. */
|
||||||
extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name)
|
extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Release shared object. If no further reference is available unload
|
/* Release shared object. If no further reference is available unload
|
||||||
the object. */
|
the object. */
|
||||||
extern void __gconv_release_shlib (struct __gconv_loaded_object *handle)
|
extern void __gconv_release_shlib (struct __gconv_loaded_object *handle);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Fill STEP with information about builtin module with NAME. */
|
/* Fill STEP with information about builtin module with NAME. */
|
||||||
extern void __gconv_get_builtin_trans (const char *name,
|
extern void __gconv_get_builtin_trans (const char *name,
|
||||||
struct __gconv_step *step)
|
struct __gconv_step *step);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
libc_hidden_proto (__gconv_transliterate)
|
libc_hidden_proto (__gconv_transliterate)
|
||||||
|
|
||||||
/* If NAME is an codeset alias expand it. */
|
/* If NAME is an codeset alias expand it. */
|
||||||
extern int __gconv_compare_alias (const char *name1, const char *name2)
|
extern int __gconv_compare_alias (const char *name1, const char *name2);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
|
|
||||||
/* Builtin transformations. */
|
/* Builtin transformations. */
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
__gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
|
__gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
|
||||||
int flags)
|
int flags)
|
||||||
{
|
{
|
||||||
|
@ -113,7 +113,7 @@ static int process_fd (iconv_t cd, int fd, FILE **output,
|
|||||||
const char *output_file);
|
const char *output_file);
|
||||||
static int process_file (iconv_t cd, FILE *input, FILE **output,
|
static int process_file (iconv_t cd, FILE *input, FILE **output,
|
||||||
const char *output_file);
|
const char *output_file);
|
||||||
static void print_known_names (void) internal_function;
|
static void print_known_names (void);
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
@ -712,7 +712,6 @@ do_print (const void *nodep, VISIT value, int level)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
internal_function
|
|
||||||
add_known_names (struct gconv_module *node)
|
add_known_names (struct gconv_module *node)
|
||||||
{
|
{
|
||||||
if (node->left != NULL)
|
if (node->left != NULL)
|
||||||
@ -756,7 +755,6 @@ insert_cache (void)
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
internal_function
|
|
||||||
print_known_names (void)
|
print_known_names (void)
|
||||||
{
|
{
|
||||||
iconv_t h;
|
iconv_t h;
|
||||||
|
@ -566,7 +566,6 @@ new_module (const char *fromname, size_t fromlen, const char *toname,
|
|||||||
|
|
||||||
/* Add new module. */
|
/* Add new module. */
|
||||||
static void
|
static void
|
||||||
internal_function
|
|
||||||
add_module (char *rp, const char *directory)
|
add_module (char *rp, const char *directory)
|
||||||
{
|
{
|
||||||
/* We expect now
|
/* We expect now
|
||||||
|
@ -347,18 +347,15 @@ struct binding *_nl_domain_bindings;
|
|||||||
/* Prototypes for local functions. */
|
/* Prototypes for local functions. */
|
||||||
static char *plural_lookup (struct loaded_l10nfile *domain,
|
static char *plural_lookup (struct loaded_l10nfile *domain,
|
||||||
unsigned long int n,
|
unsigned long int n,
|
||||||
const char *translation, size_t translation_len)
|
const char *translation, size_t translation_len);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
#ifdef IN_LIBGLOCALE
|
#ifdef IN_LIBGLOCALE
|
||||||
static const char *guess_category_value (int category,
|
static const char *guess_category_value (int category,
|
||||||
const char *categoryname,
|
const char *categoryname,
|
||||||
const char *localename)
|
const char *localename);
|
||||||
internal_function;
|
|
||||||
#else
|
#else
|
||||||
static const char *guess_category_value (int category,
|
static const char *guess_category_value (int category,
|
||||||
const char *categoryname)
|
const char *categoryname);
|
||||||
internal_function;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _LIBC
|
#ifdef _LIBC
|
||||||
@ -366,11 +363,10 @@ static const char *guess_category_value (int category,
|
|||||||
# define category_to_name(category) \
|
# define category_to_name(category) \
|
||||||
_nl_category_names.str + _nl_category_name_idxs[category]
|
_nl_category_names.str + _nl_category_name_idxs[category]
|
||||||
#else
|
#else
|
||||||
static const char *category_to_name (int category) internal_function;
|
static const char *category_to_name (int category);
|
||||||
#endif
|
#endif
|
||||||
#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
|
#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
|
||||||
static const char *get_output_charset (struct binding *domainbinding)
|
static const char *get_output_charset (struct binding *domainbinding);
|
||||||
internal_function;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@ -868,7 +864,6 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
|
|||||||
in case of a memory allocation failure during conversion (only if
|
in case of a memory allocation failure during conversion (only if
|
||||||
ENCODING != NULL resp. CONVERT == true). */
|
ENCODING != NULL resp. CONVERT == true). */
|
||||||
char *
|
char *
|
||||||
internal_function
|
|
||||||
#ifdef IN_LIBGLOCALE
|
#ifdef IN_LIBGLOCALE
|
||||||
_nl_find_msg (struct loaded_l10nfile *domain_file,
|
_nl_find_msg (struct loaded_l10nfile *domain_file,
|
||||||
struct binding *domainbinding, const char *encoding,
|
struct binding *domainbinding, const char *encoding,
|
||||||
@ -1401,7 +1396,6 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
|
|||||||
|
|
||||||
/* Look up a plural variant. */
|
/* Look up a plural variant. */
|
||||||
static char *
|
static char *
|
||||||
internal_function
|
|
||||||
plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
|
plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
|
||||||
const char *translation, size_t translation_len)
|
const char *translation, size_t translation_len)
|
||||||
{
|
{
|
||||||
@ -1439,7 +1433,6 @@ plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
|
|||||||
#ifndef _LIBC
|
#ifndef _LIBC
|
||||||
/* Return string representation of locale CATEGORY. */
|
/* Return string representation of locale CATEGORY. */
|
||||||
static const char *
|
static const char *
|
||||||
internal_function
|
|
||||||
category_to_name (int category)
|
category_to_name (int category)
|
||||||
{
|
{
|
||||||
const char *retval;
|
const char *retval;
|
||||||
@ -1500,7 +1493,6 @@ category_to_name (int category)
|
|||||||
/* Guess value of current locale from value of the environment variables
|
/* Guess value of current locale from value of the environment variables
|
||||||
or system-dependent defaults. */
|
or system-dependent defaults. */
|
||||||
static const char *
|
static const char *
|
||||||
internal_function
|
|
||||||
#ifdef IN_LIBGLOCALE
|
#ifdef IN_LIBGLOCALE
|
||||||
guess_category_value (int category, const char *categoryname,
|
guess_category_value (int category, const char *categoryname,
|
||||||
const char *locale)
|
const char *locale)
|
||||||
@ -1591,7 +1583,6 @@ guess_category_value (int category, const char *categoryname)
|
|||||||
#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
|
#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
|
||||||
/* Returns the output charset. */
|
/* Returns the output charset. */
|
||||||
static const char *
|
static const char *
|
||||||
internal_function
|
|
||||||
get_output_charset (struct binding *domainbinding)
|
get_output_charset (struct binding *domainbinding)
|
||||||
{
|
{
|
||||||
/* The output charset should normally be determined by the locale. But
|
/* The output charset should normally be determined by the locale. But
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
/* Evaluate the plural expression and return an index value. */
|
/* Evaluate the plural expression and return an index value. */
|
||||||
STATIC
|
STATIC
|
||||||
unsigned long int
|
unsigned long int
|
||||||
internal_function
|
|
||||||
plural_eval (const struct expression *pexp, unsigned long int n)
|
plural_eval (const struct expression *pexp, unsigned long int n)
|
||||||
{
|
{
|
||||||
switch (pexp->nargs)
|
switch (pexp->nargs)
|
||||||
|
@ -55,7 +55,6 @@ static struct loaded_l10nfile *_nl_loaded_domains;
|
|||||||
the DOMAINNAME and CATEGORY parameters with respect to the currently
|
the DOMAINNAME and CATEGORY parameters with respect to the currently
|
||||||
established bindings. */
|
established bindings. */
|
||||||
struct loaded_l10nfile *
|
struct loaded_l10nfile *
|
||||||
internal_function
|
|
||||||
_nl_find_domain (const char *dirname, char *locale,
|
_nl_find_domain (const char *dirname, char *locale,
|
||||||
const char *domainname, struct binding *domainbinding)
|
const char *domainname, struct binding *domainbinding)
|
||||||
{
|
{
|
||||||
|
@ -61,7 +61,7 @@ extern char *__bind_textdomain_codeset (const char *__domainname,
|
|||||||
const char *__codeset);
|
const char *__codeset);
|
||||||
extern void _nl_finddomain_subfreeres (void) attribute_hidden;
|
extern void _nl_finddomain_subfreeres (void) attribute_hidden;
|
||||||
extern void _nl_unload_domain (struct loaded_domain *__domain)
|
extern void _nl_unload_domain (struct loaded_domain *__domain)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
#else
|
#else
|
||||||
/* Declare the exported libintl_* functions, in a way that allows us to
|
/* Declare the exported libintl_* functions, in a way that allows us to
|
||||||
call them under their real name. */
|
call them under their real name. */
|
||||||
@ -89,10 +89,6 @@ extern char *libintl_dcigettext (const char *__domainname,
|
|||||||
|
|
||||||
/* @@ end of prolog @@ */
|
/* @@ end of prolog @@ */
|
||||||
|
|
||||||
#ifndef internal_function
|
|
||||||
# define internal_function
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef attribute_hidden
|
#ifndef attribute_hidden
|
||||||
# define attribute_hidden
|
# define attribute_hidden
|
||||||
#endif
|
#endif
|
||||||
@ -255,23 +251,19 @@ extern const char *_nl_locale_name_default (void);
|
|||||||
|
|
||||||
struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
|
struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
|
||||||
const char *__domainname,
|
const char *__domainname,
|
||||||
struct binding *__domainbinding)
|
struct binding *__domainbinding);
|
||||||
internal_function;
|
|
||||||
void _nl_load_domain (struct loaded_l10nfile *__domain,
|
void _nl_load_domain (struct loaded_l10nfile *__domain,
|
||||||
struct binding *__domainbinding)
|
struct binding *__domainbinding);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
#ifdef IN_LIBGLOCALE
|
#ifdef IN_LIBGLOCALE
|
||||||
char *_nl_find_msg (struct loaded_l10nfile *domain_file,
|
char *_nl_find_msg (struct loaded_l10nfile *domain_file,
|
||||||
struct binding *domainbinding, const char *encoding,
|
struct binding *domainbinding, const char *encoding,
|
||||||
const char *msgid,
|
const char *msgid,
|
||||||
size_t *lengthp)
|
size_t *lengthp);
|
||||||
internal_function;
|
|
||||||
#else
|
#else
|
||||||
char *_nl_find_msg (struct loaded_l10nfile *domain_file,
|
char *_nl_find_msg (struct loaded_l10nfile *domain_file,
|
||||||
struct binding *domainbinding, const char *msgid,
|
struct binding *domainbinding, const char *msgid,
|
||||||
int convert, size_t *lengthp)
|
int convert, size_t *lengthp);
|
||||||
internal_function;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The internal variables in the standalone libintl.a must have different
|
/* The internal variables in the standalone libintl.a must have different
|
||||||
|
@ -30,10 +30,6 @@
|
|||||||
in gettextP.h.
|
in gettextP.h.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef internal_function
|
|
||||||
# define internal_function
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef LIBINTL_DLL_EXPORTED
|
#ifndef LIBINTL_DLL_EXPORTED
|
||||||
# define LIBINTL_DLL_EXPORTED
|
# define LIBINTL_DLL_EXPORTED
|
||||||
#endif
|
#endif
|
||||||
|
@ -749,7 +749,6 @@ get_sysdep_segment_value (const char *name)
|
|||||||
/* Load the message catalogs specified by FILENAME. If it is no valid
|
/* Load the message catalogs specified by FILENAME. If it is no valid
|
||||||
message catalog do nothing. */
|
message catalog do nothing. */
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
_nl_load_domain (struct loaded_l10nfile *domain_file,
|
_nl_load_domain (struct loaded_l10nfile *domain_file,
|
||||||
struct binding *domainbinding)
|
struct binding *domainbinding)
|
||||||
{
|
{
|
||||||
@ -1285,7 +1284,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
|
|||||||
|
|
||||||
#ifdef _LIBC
|
#ifdef _LIBC
|
||||||
void
|
void
|
||||||
internal_function __libc_freeres_fn_section
|
__libc_freeres_fn_section
|
||||||
_nl_unload_domain (struct loaded_domain *domain)
|
_nl_unload_domain (struct loaded_domain *domain)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
|
@ -88,10 +88,6 @@ char *alloca ();
|
|||||||
# include "lock.h"
|
# include "lock.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef internal_function
|
|
||||||
# define internal_function
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Some optimizations for glibc. */
|
/* Some optimizations for glibc. */
|
||||||
#ifdef _LIBC
|
#ifdef _LIBC
|
||||||
# define FEOF(fp) feof_unlocked (fp)
|
# define FEOF(fp) feof_unlocked (fp)
|
||||||
@ -143,8 +139,7 @@ static size_t maxmap;
|
|||||||
|
|
||||||
|
|
||||||
/* Prototypes for local functions. */
|
/* Prototypes for local functions. */
|
||||||
static size_t read_alias_file (const char *fname, int fname_len)
|
static size_t read_alias_file (const char *fname, int fname_len);
|
||||||
internal_function;
|
|
||||||
static int extend_alias_table (void);
|
static int extend_alias_table (void);
|
||||||
static int alias_compare (const struct alias_map *map1,
|
static int alias_compare (const struct alias_map *map1,
|
||||||
const struct alias_map *map2);
|
const struct alias_map *map2);
|
||||||
@ -212,7 +207,6 @@ _nl_expand_alias (const char *name)
|
|||||||
|
|
||||||
|
|
||||||
static size_t
|
static size_t
|
||||||
internal_function
|
|
||||||
read_alias_file (const char *fname, int fname_len)
|
read_alias_file (const char *fname, int fname_len)
|
||||||
{
|
{
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
@ -94,7 +94,6 @@ init_germanic_plural (void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
|
EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
|
||||||
const struct expression **pluralp,
|
const struct expression **pluralp,
|
||||||
unsigned long int *npluralsp)
|
unsigned long int *npluralsp)
|
||||||
|
@ -18,10 +18,6 @@
|
|||||||
#ifndef _PLURAL_EXP_H
|
#ifndef _PLURAL_EXP_H
|
||||||
#define _PLURAL_EXP_H
|
#define _PLURAL_EXP_H
|
||||||
|
|
||||||
#ifndef internal_function
|
|
||||||
# define internal_function
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef attribute_hidden
|
#ifndef attribute_hidden
|
||||||
# define attribute_hidden
|
# define attribute_hidden
|
||||||
#endif
|
#endif
|
||||||
@ -105,14 +101,12 @@ struct parse_args
|
|||||||
# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
|
# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern void FREE_EXPRESSION (struct expression *exp)
|
extern void FREE_EXPRESSION (struct expression *exp);
|
||||||
internal_function;
|
|
||||||
extern int PLURAL_PARSE (struct parse_args *arg);
|
extern int PLURAL_PARSE (struct parse_args *arg);
|
||||||
extern const struct expression GERMANIC_PLURAL attribute_hidden;
|
extern const struct expression GERMANIC_PLURAL attribute_hidden;
|
||||||
extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
|
extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
|
||||||
const struct expression **pluralp,
|
const struct expression **pluralp,
|
||||||
unsigned long int *npluralsp)
|
unsigned long int *npluralsp);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
#if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)
|
#if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)
|
||||||
extern unsigned long int plural_eval (const struct expression *pexp,
|
extern unsigned long int plural_eval (const struct expression *pexp,
|
||||||
|
@ -1836,7 +1836,6 @@ yyreturn:
|
|||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
FREE_EXPRESSION (struct expression *exp)
|
FREE_EXPRESSION (struct expression *exp)
|
||||||
{
|
{
|
||||||
if (exp == NULL)
|
if (exp == NULL)
|
||||||
|
@ -207,7 +207,6 @@ exp: exp '?' exp ':' exp
|
|||||||
%%
|
%%
|
||||||
|
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
FREE_EXPRESSION (struct expression *exp)
|
FREE_EXPRESSION (struct expression *exp)
|
||||||
{
|
{
|
||||||
if (exp == NULL)
|
if (exp == NULL)
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
|
|
||||||
/* Lookup in a table of int32_t, with default value 0. */
|
/* Lookup in a table of int32_t, with default value 0. */
|
||||||
int32_t
|
int32_t
|
||||||
internal_function
|
|
||||||
__collidx_table_lookup (const char *table, uint32_t wc)
|
__collidx_table_lookup (const char *table, uint32_t wc)
|
||||||
{
|
{
|
||||||
uint32_t shift1 = ((const uint32_t *) table)[0];
|
uint32_t shift1 = ((const uint32_t *) table)[0];
|
||||||
@ -51,7 +50,6 @@ __collidx_table_lookup (const char *table, uint32_t wc)
|
|||||||
|
|
||||||
/* Lookup in a table of uint32_t, with default value 0xffffffff. */
|
/* Lookup in a table of uint32_t, with default value 0xffffffff. */
|
||||||
uint32_t
|
uint32_t
|
||||||
internal_function
|
|
||||||
__collseq_table_lookup (const char *table, uint32_t wc)
|
__collseq_table_lookup (const char *table, uint32_t wc)
|
||||||
{
|
{
|
||||||
uint32_t shift1 = ((const uint32_t *) table)[0];
|
uint32_t shift1 = ((const uint32_t *) table)[0];
|
||||||
|
@ -19,9 +19,7 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
/* Lookup in a table of int32_t, with default value 0. */
|
/* Lookup in a table of int32_t, with default value 0. */
|
||||||
extern int32_t __collidx_table_lookup (const char *table, uint32_t wc)
|
extern int32_t __collidx_table_lookup (const char *table, uint32_t wc);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Lookup in a table of uint32_t, with default value 0xffffffff. */
|
/* Lookup in a table of uint32_t, with default value 0xffffffff. */
|
||||||
extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc)
|
extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc);
|
||||||
internal_function;
|
|
||||||
|
@ -99,7 +99,6 @@ valid_locale_name (const char *name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct __locale_data *
|
struct __locale_data *
|
||||||
internal_function
|
|
||||||
_nl_find_locale (const char *locale_path, size_t locale_path_len,
|
_nl_find_locale (const char *locale_path, size_t locale_path_len,
|
||||||
int category, const char **name)
|
int category, const char **name)
|
||||||
{
|
{
|
||||||
@ -332,7 +331,6 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
|
|||||||
/* Calling this function assumes the lock for handling global locale data
|
/* Calling this function assumes the lock for handling global locale data
|
||||||
is acquired. */
|
is acquired. */
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
_nl_remove_locale (int locale, struct __locale_data *data)
|
_nl_remove_locale (int locale, struct __locale_data *data)
|
||||||
{
|
{
|
||||||
if (--data->usage_count == 0)
|
if (--data->usage_count == 0)
|
||||||
|
@ -130,7 +130,6 @@ calculate_head_size (const struct locarhead *h)
|
|||||||
structure. If successful, sets *NAMEP to point directly into the mapped
|
structure. If successful, sets *NAMEP to point directly into the mapped
|
||||||
archive string table; that way, the next call can short-circuit strcmp. */
|
archive string table; that way, the next call can short-circuit strcmp. */
|
||||||
struct __locale_data *
|
struct __locale_data *
|
||||||
internal_function
|
|
||||||
_nl_load_locale_from_archive (int category, const char **namep)
|
_nl_load_locale_from_archive (int category, const char **namep)
|
||||||
{
|
{
|
||||||
const char *name = *namep;
|
const char *name = *namep;
|
||||||
|
@ -61,7 +61,6 @@ static const enum value_type *const _nl_value_types[] =
|
|||||||
|
|
||||||
|
|
||||||
struct __locale_data *
|
struct __locale_data *
|
||||||
internal_function
|
|
||||||
_nl_intern_locale_data (int category, const void *data, size_t datasize)
|
_nl_intern_locale_data (int category, const void *data, size_t datasize)
|
||||||
{
|
{
|
||||||
const struct
|
const struct
|
||||||
@ -160,7 +159,6 @@ _nl_intern_locale_data (int category, const void *data, size_t datasize)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
_nl_load_locale (struct loaded_l10nfile *file, int category)
|
_nl_load_locale (struct loaded_l10nfile *file, int category)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
@ -282,7 +280,6 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
_nl_unload_locale (struct __locale_data *locale)
|
_nl_unload_locale (struct __locale_data *locale)
|
||||||
{
|
{
|
||||||
if (locale->private.cleanup)
|
if (locale->private.cleanup)
|
||||||
|
@ -63,7 +63,7 @@ struct __locale_data
|
|||||||
the data. */
|
the data. */
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
void (*cleanup) (struct __locale_data *) internal_function;
|
void (*cleanup) (struct __locale_data *);
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
void *data;
|
void *data;
|
||||||
@ -336,19 +336,18 @@ extern const char _nl_default_locale_path[] attribute_hidden;
|
|||||||
extern struct __locale_data *_nl_find_locale (const char *locale_path,
|
extern struct __locale_data *_nl_find_locale (const char *locale_path,
|
||||||
size_t locale_path_len,
|
size_t locale_path_len,
|
||||||
int category, const char **name)
|
int category, const char **name)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
/* Try to load the file described by FILE. */
|
/* Try to load the file described by FILE. */
|
||||||
extern void _nl_load_locale (struct loaded_l10nfile *file, int category)
|
extern void _nl_load_locale (struct loaded_l10nfile *file, int category)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
/* Free all resource. */
|
/* Free all resource. */
|
||||||
extern void _nl_unload_locale (struct __locale_data *locale)
|
extern void _nl_unload_locale (struct __locale_data *locale) attribute_hidden;
|
||||||
internal_function attribute_hidden;
|
|
||||||
|
|
||||||
/* Free the locale and give back all memory if the usage count is one. */
|
/* Free the locale and give back all memory if the usage count is one. */
|
||||||
extern void _nl_remove_locale (int locale, struct __locale_data *data)
|
extern void _nl_remove_locale (int locale, struct __locale_data *data)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
/* Find the locale *NAMEP in the locale archive, and return the
|
/* Find the locale *NAMEP in the locale archive, and return the
|
||||||
internalized data structure for its CATEGORY data. If this locale has
|
internalized data structure for its CATEGORY data. If this locale has
|
||||||
@ -357,7 +356,7 @@ extern void _nl_remove_locale (int locale, struct __locale_data *data)
|
|||||||
archive string table; that way, the next call can short-circuit strcmp. */
|
archive string table; that way, the next call can short-circuit strcmp. */
|
||||||
extern struct __locale_data *_nl_load_locale_from_archive (int category,
|
extern struct __locale_data *_nl_load_locale_from_archive (int category,
|
||||||
const char **namep)
|
const char **namep)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
/* Subroutine of setlocale's __libc_subfreeres hook. */
|
/* Subroutine of setlocale's __libc_subfreeres hook. */
|
||||||
extern void _nl_archive_subfreeres (void) attribute_hidden;
|
extern void _nl_archive_subfreeres (void) attribute_hidden;
|
||||||
@ -373,40 +372,39 @@ extern void _nl_locale_subfreeres (void) attribute_hidden;
|
|||||||
extern struct __locale_data *_nl_intern_locale_data (int category,
|
extern struct __locale_data *_nl_intern_locale_data (int category,
|
||||||
const void *data,
|
const void *data,
|
||||||
size_t datasize)
|
size_t datasize)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
|
|
||||||
/* Return `era' entry which corresponds to TP. Used in strftime. */
|
/* Return `era' entry which corresponds to TP. Used in strftime. */
|
||||||
extern struct era_entry *_nl_get_era_entry (const struct tm *tp,
|
extern struct era_entry *_nl_get_era_entry (const struct tm *tp,
|
||||||
struct __locale_data *lc_time)
|
struct __locale_data *lc_time)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
/* Return `era' cnt'th entry . Used in strptime. */
|
/* Return `era' cnt'th entry . Used in strptime. */
|
||||||
extern struct era_entry *_nl_select_era_entry (int cnt,
|
extern struct era_entry *_nl_select_era_entry (int cnt,
|
||||||
struct __locale_data *lc_time)
|
struct __locale_data *lc_time)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
/* Return `alt_digit' which corresponds to NUMBER. Used in strftime. */
|
/* Return `alt_digit' which corresponds to NUMBER. Used in strftime. */
|
||||||
extern const char *_nl_get_alt_digit (unsigned int number,
|
extern const char *_nl_get_alt_digit (unsigned int number,
|
||||||
struct __locale_data *lc_time)
|
struct __locale_data *lc_time)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
/* Similar, but now for wide characters. */
|
/* Similar, but now for wide characters. */
|
||||||
extern const wchar_t *_nl_get_walt_digit (unsigned int number,
|
extern const wchar_t *_nl_get_walt_digit (unsigned int number,
|
||||||
struct __locale_data *lc_time)
|
struct __locale_data *lc_time)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
/* Parse string as alternative digit and return numeric value. */
|
/* Parse string as alternative digit and return numeric value. */
|
||||||
extern int _nl_parse_alt_digit (const char **strp,
|
extern int _nl_parse_alt_digit (const char **strp,
|
||||||
struct __locale_data *lc_time)
|
struct __locale_data *lc_time)
|
||||||
internal_function attribute_hidden;
|
attribute_hidden;
|
||||||
|
|
||||||
/* Postload processing. */
|
/* Postload processing. */
|
||||||
extern void _nl_postload_ctype (void);
|
extern void _nl_postload_ctype (void);
|
||||||
|
|
||||||
/* Functions used for the `private.cleanup' hook. */
|
/* Functions used for the `private.cleanup' hook. */
|
||||||
extern void _nl_cleanup_time (struct __locale_data *)
|
extern void _nl_cleanup_time (struct __locale_data *) attribute_hidden;
|
||||||
internal_function attribute_hidden;
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* localeinfo.h */
|
#endif /* localeinfo.h */
|
||||||
|
@ -69,7 +69,6 @@ _nl_init_alt_digit (struct __locale_data *current)
|
|||||||
}
|
}
|
||||||
|
|
||||||
const char *
|
const char *
|
||||||
internal_function
|
|
||||||
_nl_get_alt_digit (unsigned int number, struct __locale_data *current)
|
_nl_get_alt_digit (unsigned int number, struct __locale_data *current)
|
||||||
{
|
{
|
||||||
const char *result;
|
const char *result;
|
||||||
@ -95,7 +94,6 @@ _nl_get_alt_digit (unsigned int number, struct __locale_data *current)
|
|||||||
|
|
||||||
|
|
||||||
const wchar_t *
|
const wchar_t *
|
||||||
internal_function
|
|
||||||
_nl_get_walt_digit (unsigned int number, struct __locale_data *current)
|
_nl_get_walt_digit (unsigned int number, struct __locale_data *current)
|
||||||
{
|
{
|
||||||
const wchar_t *result = NULL;
|
const wchar_t *result = NULL;
|
||||||
@ -148,7 +146,6 @@ _nl_get_walt_digit (unsigned int number, struct __locale_data *current)
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
_nl_parse_alt_digit (const char **strp, struct __locale_data *current)
|
_nl_parse_alt_digit (const char **strp, struct __locale_data *current)
|
||||||
{
|
{
|
||||||
const char *str = *strp;
|
const char *str = *strp;
|
||||||
|
@ -35,7 +35,7 @@ __libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden)
|
|||||||
|
|
||||||
/* Look up the era information in CURRENT's locale strings and
|
/* Look up the era information in CURRENT's locale strings and
|
||||||
cache it in CURRENT->private. */
|
cache it in CURRENT->private. */
|
||||||
static void internal_function
|
static void
|
||||||
_nl_init_era_entries (struct __locale_data *current)
|
_nl_init_era_entries (struct __locale_data *current)
|
||||||
{
|
{
|
||||||
size_t cnt;
|
size_t cnt;
|
||||||
@ -139,7 +139,6 @@ _nl_init_era_entries (struct __locale_data *current)
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct era_entry *
|
struct era_entry *
|
||||||
internal_function
|
|
||||||
_nl_get_era_entry (const struct tm *tp, struct __locale_data *current)
|
_nl_get_era_entry (const struct tm *tp, struct __locale_data *current)
|
||||||
{
|
{
|
||||||
if (current->private.time == NULL || !current->private.time->era_initialized)
|
if (current->private.time == NULL || !current->private.time->era_initialized)
|
||||||
@ -166,7 +165,6 @@ _nl_get_era_entry (const struct tm *tp, struct __locale_data *current)
|
|||||||
|
|
||||||
|
|
||||||
struct era_entry *
|
struct era_entry *
|
||||||
internal_function
|
|
||||||
_nl_select_era_entry (int cnt, struct __locale_data *current)
|
_nl_select_era_entry (int cnt, struct __locale_data *current)
|
||||||
{
|
{
|
||||||
if (current->private.time == NULL || !current->private.time->era_initialized)
|
if (current->private.time == NULL || !current->private.time->era_initialized)
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "../locale/localeinfo.h"
|
#include "../locale/localeinfo.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
void internal_function
|
void
|
||||||
_nl_cleanup_time (struct __locale_data *locale)
|
_nl_cleanup_time (struct __locale_data *locale)
|
||||||
{
|
{
|
||||||
struct lc_time_data *const data = locale->private.time;
|
struct lc_time_data *const data = locale->private.time;
|
||||||
|
@ -148,7 +148,6 @@ __libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden)
|
|||||||
|
|
||||||
/* Load conversion functions for the currently selected locale. */
|
/* Load conversion functions for the currently selected locale. */
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
__wcsmbs_load_conv (struct __locale_data *new_category)
|
__wcsmbs_load_conv (struct __locale_data *new_category)
|
||||||
{
|
{
|
||||||
/* Acquire the lock. */
|
/* Acquire the lock. */
|
||||||
@ -215,7 +214,6 @@ __wcsmbs_load_conv (struct __locale_data *new_category)
|
|||||||
|
|
||||||
/* Clone the current conversion function set. */
|
/* Clone the current conversion function set. */
|
||||||
void
|
void
|
||||||
internal_function
|
|
||||||
__wcsmbs_clone_conv (struct gconv_fcts *copy)
|
__wcsmbs_clone_conv (struct gconv_fcts *copy)
|
||||||
{
|
{
|
||||||
const struct gconv_fcts *orig;
|
const struct gconv_fcts *orig;
|
||||||
@ -236,7 +234,6 @@ __wcsmbs_clone_conv (struct gconv_fcts *copy)
|
|||||||
|
|
||||||
/* Get converters for named charset. */
|
/* Get converters for named charset. */
|
||||||
int
|
int
|
||||||
internal_function
|
|
||||||
__wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)
|
__wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)
|
||||||
{
|
{
|
||||||
copy->towc = __wcsmbs_getfct ("INTERNAL", name, ©->towc_nsteps);
|
copy->towc = __wcsmbs_getfct ("INTERNAL", name, ©->towc_nsteps);
|
||||||
@ -253,7 +250,7 @@ __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void internal_function
|
void
|
||||||
_nl_cleanup_ctype (struct __locale_data *locale)
|
_nl_cleanup_ctype (struct __locale_data *locale)
|
||||||
{
|
{
|
||||||
const struct gconv_fcts *const data = locale->private.ctype;
|
const struct gconv_fcts *const data = locale->private.ctype;
|
||||||
|
@ -37,20 +37,16 @@ struct gconv_fcts
|
|||||||
extern const struct gconv_fcts __wcsmbs_gconv_fcts_c attribute_hidden;
|
extern const struct gconv_fcts __wcsmbs_gconv_fcts_c attribute_hidden;
|
||||||
|
|
||||||
/* Load conversion functions for the currently selected locale. */
|
/* Load conversion functions for the currently selected locale. */
|
||||||
extern void __wcsmbs_load_conv (struct __locale_data *new_category)
|
extern void __wcsmbs_load_conv (struct __locale_data *new_category);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Clone the current `__wcsmbs_load_conv' value. */
|
/* Clone the current `__wcsmbs_load_conv' value. */
|
||||||
extern void __wcsmbs_clone_conv (struct gconv_fcts *copy)
|
extern void __wcsmbs_clone_conv (struct gconv_fcts *copy);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Find the conversion functions for converting to and from NAME. */
|
/* Find the conversion functions for converting to and from NAME. */
|
||||||
extern int __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)
|
extern int __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name);
|
||||||
internal_function;
|
|
||||||
|
|
||||||
/* Function used for the `private.cleanup' hook. */
|
/* Function used for the `private.cleanup' hook. */
|
||||||
extern void _nl_cleanup_ctype (struct __locale_data *)
|
extern void _nl_cleanup_ctype (struct __locale_data *) attribute_hidden;
|
||||||
internal_function attribute_hidden;
|
|
||||||
|
|
||||||
|
|
||||||
#include <iconv/gconv_int.h>
|
#include <iconv/gconv_int.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user