aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-08-15 17:52:59 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-08-31 15:59:06 +0200
commitd7ccc6c983632f89064e0405e724ca6e9c1b9e1e (patch)
tree2ec4f8e58e1720b3956c193150a081f570730bb6 /locale
parentdab0eecef632487f01460900ede02874092c9169 (diff)
downloadglibc-d7ccc6c983632f89064e0405e724ca6e9c1b9e1e.zip
glibc-d7ccc6c983632f89064e0405e724ca6e9c1b9e1e.tar.gz
glibc-d7ccc6c983632f89064e0405e724ca6e9c1b9e1e.tar.bz2
iconv, intl, locale, wcsmbs: Remove internal_function
Also adjust parts of the time subdirectory.
Diffstat (limited to 'locale')
-rw-r--r--locale/coll-lookup.c2
-rw-r--r--locale/coll-lookup.h6
-rw-r--r--locale/findlocale.c2
-rw-r--r--locale/loadarchive.c1
-rw-r--r--locale/loadlocale.c3
-rw-r--r--locale/localeinfo.h28
6 files changed, 15 insertions, 27 deletions
diff --git a/locale/coll-lookup.c b/locale/coll-lookup.c
index a4deb9c..349265f 100644
--- a/locale/coll-lookup.c
+++ b/locale/coll-lookup.c
@@ -20,7 +20,6 @@
/* Lookup in a table of int32_t, with default value 0. */
int32_t
-internal_function
__collidx_table_lookup (const char *table, uint32_t wc)
{
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. */
uint32_t
-internal_function
__collseq_table_lookup (const char *table, uint32_t wc)
{
uint32_t shift1 = ((const uint32_t *) table)[0];
diff --git a/locale/coll-lookup.h b/locale/coll-lookup.h
index d95408a..d1c488d 100644
--- a/locale/coll-lookup.h
+++ b/locale/coll-lookup.h
@@ -19,9 +19,7 @@
#include <stdint.h>
/* Lookup in a table of int32_t, with default value 0. */
-extern int32_t __collidx_table_lookup (const char *table, uint32_t wc)
- internal_function;
+extern int32_t __collidx_table_lookup (const char *table, uint32_t wc);
/* Lookup in a table of uint32_t, with default value 0xffffffff. */
-extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc)
- internal_function;
+extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc);
diff --git a/locale/findlocale.c b/locale/findlocale.c
index 02a97ac..6002960 100644
--- a/locale/findlocale.c
+++ b/locale/findlocale.c
@@ -99,7 +99,6 @@ valid_locale_name (const char *name)
}
struct __locale_data *
-internal_function
_nl_find_locale (const char *locale_path, size_t locale_path_len,
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
is acquired. */
void
-internal_function
_nl_remove_locale (int locale, struct __locale_data *data)
{
if (--data->usage_count == 0)
diff --git a/locale/loadarchive.c b/locale/loadarchive.c
index 158cf14..ebbac6a 100644
--- a/locale/loadarchive.c
+++ b/locale/loadarchive.c
@@ -130,7 +130,6 @@ calculate_head_size (const struct locarhead *h)
structure. If successful, sets *NAMEP to point directly into the mapped
archive string table; that way, the next call can short-circuit strcmp. */
struct __locale_data *
-internal_function
_nl_load_locale_from_archive (int category, const char **namep)
{
const char *name = *namep;
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index 24ad671..2bdb39b 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -61,7 +61,6 @@ static const enum value_type *const _nl_value_types[] =
struct __locale_data *
-internal_function
_nl_intern_locale_data (int category, const void *data, size_t datasize)
{
const struct
@@ -160,7 +159,6 @@ _nl_intern_locale_data (int category, const void *data, size_t datasize)
}
void
-internal_function
_nl_load_locale (struct loaded_l10nfile *file, int category)
{
int fd;
@@ -282,7 +280,6 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
}
void
-internal_function
_nl_unload_locale (struct __locale_data *locale)
{
if (locale->private.cleanup)
diff --git a/locale/localeinfo.h b/locale/localeinfo.h
index 4e1c8c5..06f01d9 100644
--- a/locale/localeinfo.h
+++ b/locale/localeinfo.h
@@ -63,7 +63,7 @@ struct __locale_data
the data. */
struct
{
- void (*cleanup) (struct __locale_data *) internal_function;
+ void (*cleanup) (struct __locale_data *);
union
{
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,
size_t locale_path_len,
int category, const char **name)
- internal_function attribute_hidden;
+ attribute_hidden;
/* Try to load the file described by FILE. */
extern void _nl_load_locale (struct loaded_l10nfile *file, int category)
- internal_function attribute_hidden;
+ attribute_hidden;
/* Free all resource. */
-extern void _nl_unload_locale (struct __locale_data *locale)
- internal_function attribute_hidden;
+extern void _nl_unload_locale (struct __locale_data *locale) attribute_hidden;
/* 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)
- internal_function attribute_hidden;
+ attribute_hidden;
/* Find the locale *NAMEP in the locale archive, and return the
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. */
extern struct __locale_data *_nl_load_locale_from_archive (int category,
const char **namep)
- internal_function attribute_hidden;
+ attribute_hidden;
/* Subroutine of setlocale's __libc_subfreeres hook. */
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,
const void *data,
size_t datasize)
- internal_function attribute_hidden;
+ attribute_hidden;
/* Return `era' entry which corresponds to TP. Used in strftime. */
extern struct era_entry *_nl_get_era_entry (const struct tm *tp,
struct __locale_data *lc_time)
- internal_function attribute_hidden;
+ attribute_hidden;
/* Return `era' cnt'th entry . Used in strptime. */
extern struct era_entry *_nl_select_era_entry (int cnt,
struct __locale_data *lc_time)
- internal_function attribute_hidden;
+ attribute_hidden;
/* Return `alt_digit' which corresponds to NUMBER. Used in strftime. */
extern const char *_nl_get_alt_digit (unsigned int number,
struct __locale_data *lc_time)
- internal_function attribute_hidden;
+ attribute_hidden;
/* Similar, but now for wide characters. */
extern const wchar_t *_nl_get_walt_digit (unsigned int number,
struct __locale_data *lc_time)
- internal_function attribute_hidden;
+ attribute_hidden;
/* Parse string as alternative digit and return numeric value. */
extern int _nl_parse_alt_digit (const char **strp,
struct __locale_data *lc_time)
- internal_function attribute_hidden;
+ attribute_hidden;
/* Postload processing. */
extern void _nl_postload_ctype (void);
/* Functions used for the `private.cleanup' hook. */
-extern void _nl_cleanup_time (struct __locale_data *)
- internal_function attribute_hidden;
+extern void _nl_cleanup_time (struct __locale_data *) attribute_hidden;
#endif /* localeinfo.h */