From d7ccc6c983632f89064e0405e724ca6e9c1b9e1e Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 15 Aug 2017 17:52:59 +0200
Subject: iconv, intl, locale, wcsmbs: Remove internal_function

Also adjust parts of the time subdirectory.
---
 iconv/gconv.c         |  1 -
 iconv/gconv_builtin.c |  1 -
 iconv/gconv_cache.c   |  6 ------
 iconv/gconv_close.c   |  1 -
 iconv/gconv_conf.c    |  5 -----
 iconv/gconv_db.c      | 11 +----------
 iconv/gconv_dl.c      |  2 --
 iconv/gconv_int.h     | 42 +++++++++++++++---------------------------
 iconv/gconv_open.c    |  1 -
 iconv/iconv_prog.c    |  4 +---
 iconv/iconvconfig.c   |  1 -
 11 files changed, 17 insertions(+), 58 deletions(-)

(limited to 'iconv')

diff --git a/iconv/gconv.c b/iconv/gconv.c
index 0aab0546..3531752 100644
--- a/iconv/gconv.c
+++ b/iconv/gconv.c
@@ -28,7 +28,6 @@
 
 
 int
-internal_function
 __gconv (__gconv_t cd, const unsigned char **inbuf,
 	 const unsigned char *inbufend, unsigned char **outbuf,
 	 unsigned char *outbufend, size_t *irreversible)
diff --git a/iconv/gconv_builtin.c b/iconv/gconv_builtin.c
index 111233d..dbcd04b 100644
--- a/iconv/gconv_builtin.c
+++ b/iconv/gconv_builtin.c
@@ -59,7 +59,6 @@ static const struct builtin_map
 
 
 void
-internal_function
 __gconv_get_builtin_trans (const char *name, struct __gconv_step *step)
 {
   size_t cnt;
diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c
index 7d2751a..0744578 100644
--- a/iconv/gconv_cache.c
+++ b/iconv/gconv_cache.c
@@ -45,7 +45,6 @@ __gconv_get_cache (void)
 
 
 int
-internal_function
 __gconv_load_cache (void)
 {
   int fd;
@@ -142,7 +141,6 @@ __gconv_load_cache (void)
 
 
 static int
-internal_function
 find_module_idx (const char *str, size_t *idxp)
 {
   unsigned int idx;
@@ -181,7 +179,6 @@ find_module_idx (const char *str, size_t *idxp)
 
 #ifndef STATIC_GCONV
 static int
-internal_function
 find_module (const char *directory, const char *filename,
 	     struct __gconv_step *result)
 {
@@ -227,7 +224,6 @@ find_module (const char *directory, const char *filename,
 
 
 int
-internal_function
 __gconv_compare_alias_cache (const char *name1, const char *name2, int *result)
 {
   size_t name1_idx;
@@ -247,7 +243,6 @@ __gconv_compare_alias_cache (const char *name1, const char *name2, int *result)
 
 
 int
-internal_function
 __gconv_lookup_cache (const char *toset, const char *fromset,
 		      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.  */
 void
-internal_function
 __gconv_release_cache (struct __gconv_step *steps, size_t nsteps)
 {
   if (gconv_cache != NULL)
diff --git a/iconv/gconv_close.c b/iconv/gconv_close.c
index 4853dd8..3a908ee 100644
--- a/iconv/gconv_close.c
+++ b/iconv/gconv_close.c
@@ -23,7 +23,6 @@
 
 
 int
-internal_function
 __gconv_close (__gconv_t cd)
 {
   struct __gconv_step *srunp;
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index 5aa055d..f1c28ce 100644
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -99,7 +99,6 @@ const char *__gconv_path_envvar;
 
 /* Test whether there is already a matching module known.  */
 static int
-internal_function
 detect_conflict (const char *alias)
 {
   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.  */
 static void
-internal_function
 insert_module (struct gconv_module *newp, int tobefreed)
 {
   struct gconv_module **rootp = &__gconv_modules_db;
@@ -242,7 +240,6 @@ insert_module (struct gconv_module *newp, int tobefreed)
 
 /* Add new module.  */
 static void
-internal_function
 add_module (char *rp, const char *directory, size_t dir_len, void **modules,
 	    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.  */
 static void
-internal_function
 read_conf_file (const char *filename, const char *directory, size_t dir_len,
 		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.  */
 void
-internal_function
 __gconv_get_path (void)
 {
   struct path_elem *result;
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index 96f0871..8fcb3cd 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -121,7 +121,6 @@ static void *known_derivations;
 
 /* Look up whether given transformation was already requested before.  */
 static int
-internal_function
 derivation_lookup (const char *fromset, const char *toset,
 		   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.  */
 static void
-internal_function
 add_derivation (const char *fromset, const char *toset,
 		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.  */
 void
-internal_function
 __gconv_release_step (struct __gconv_step *step)
 {
   /* Skip builtin modules; they are not reference counted.  */
@@ -230,7 +227,6 @@ __gconv_release_step (struct __gconv_step *step)
 }
 
 static int
-internal_function
 gen_steps (struct derivation_step *best, const char *toset,
 	   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
 static int
-internal_function
 increment_counter (struct __gconv_step *steps, size_t nsteps)
 {
   /* 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 given name or the alias) to the `toset' (again with alias).  */
 static int
-internal_function
 find_derivation (const char *toset, const char *toset_expand,
 		 const char *fromset, const char *fromset_expand,
 		 struct __gconv_step **handle, size_t *nsteps)
@@ -710,7 +704,6 @@ do_lookup_alias (const char *name)
 
 
 int
-internal_function
 __gconv_compare_alias (const char *name1, const char *name2)
 {
   int result;
@@ -727,7 +720,6 @@ __gconv_compare_alias (const char *name1, const char *name2)
 
 
 int
-internal_function
 __gconv_find_transform (const char *toset, const char *fromset,
 			struct __gconv_step **handle, size_t *nsteps,
 			int flags)
@@ -793,7 +785,6 @@ __gconv_find_transform (const char *toset, const char *fromset,
 
 /* Release the entries of the modules list.  */
 int
-internal_function
 __gconv_close_transform (struct __gconv_step *steps, size_t nsteps)
 {
   int result = __GCONV_OK;
@@ -822,7 +813,7 @@ __gconv_close_transform (struct __gconv_step *steps, size_t nsteps)
 
 /* Free the modules mentioned.  */
 static void
-internal_function __libc_freeres_fn_section
+__libc_freeres_fn_section
 free_modules_db (struct gconv_module *node)
 {
   if (node->left != NULL)
diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c
index d7dbba9..5feb88c 100644
--- a/iconv/gconv_dl.c
+++ b/iconv/gconv_dl.c
@@ -64,7 +64,6 @@ known_compare (const void *p1, const void *p2)
 /* Open the gconv database if necessary.  A non-negative return value
    means success.  */
 struct __gconv_loaded_object *
-internal_function
 __gconv_find_shlib (const char *name)
 {
   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.  */
 void
-internal_function
 __gconv_release_shlib (struct __gconv_loaded_object *handle)
 {
   /* Urgh, this is ugly but we have no other possibility.  */
diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index 85a67ad..b1433f8 100644
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -156,12 +156,10 @@ __libc_lock_define (extern, __gconv_lock attribute_hidden)
 
 /* Return in *HANDLE decriptor for transformation from FROMSET to TOSET.  */
 extern int __gconv_open (const char *toset, const char *fromset,
-			 __gconv_t *handle, int flags)
-     internal_function;
+			 __gconv_t *handle, int flags);
 
 /* Free resources associated with transformation descriptor CD.  */
-extern int __gconv_close (__gconv_t cd)
-     internal_function;
+extern int __gconv_close (__gconv_t cd);
 
 /* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF
    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.  */
 extern int __gconv (__gconv_t cd, const unsigned char **inbuf,
 		    const unsigned char *inbufend, unsigned char **outbuf,
-		    unsigned char *outbufend, size_t *irreversible)
-     internal_function;
+		    unsigned char *outbufend, size_t *irreversible);
 
 /* Return in *HANDLE a pointer to an array with *NSTEPS elements describing
    the single steps necessary for transformation from FROMSET to TOSET.  */
 extern int __gconv_find_transform (const char *toset, const char *fromset,
 				   struct __gconv_step **handle,
-				   size_t *nsteps, int flags)
-     internal_function;
+				   size_t *nsteps, int flags);
 
 /* Search for transformation in cache data.  */
 extern int __gconv_lookup_cache (const char *toset, const char *fromset,
 				 struct __gconv_step **handle, size_t *nsteps,
-				 int flags)
-     internal_function;
+				 int flags);
 
 /* Compare the two name for whether they are after alias expansion the
    same.  This function uses the cache and fails if none is
    loaded.  */
 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.  */
-extern void __gconv_release_step (struct __gconv_step *step)
-     internal_function;
+extern void __gconv_release_step (struct __gconv_step *step);
 
 /* Read all the configuration data and cache it.  */
 extern void __gconv_read_conf (void) attribute_hidden;
 
 /* 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.  */
 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);
 
 /* 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.  */
 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
    cause the code to be unloaded.  */
 extern int __gconv_close_transform (struct __gconv_step *steps,
-				    size_t nsteps)
-     internal_function;
+				    size_t nsteps);
 
 /* Free all resources allocated for the transformation record when
    using the cache.  */
-extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps)
-     internal_function;
+extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps);
 
 /* Load shared object named by NAME.  If already loaded increment reference
    count.  */
-extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name)
-     internal_function;
+extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name);
 
 /* Release shared object.  If no further reference is available unload
    the object.  */
-extern void __gconv_release_shlib (struct __gconv_loaded_object *handle)
-     internal_function;
+extern void __gconv_release_shlib (struct __gconv_loaded_object *handle);
 
 /* Fill STEP with information about builtin module with NAME.  */
 extern void __gconv_get_builtin_trans (const char *name,
-				       struct __gconv_step *step)
-     internal_function;
+				       struct __gconv_step *step);
 
 libc_hidden_proto (__gconv_transliterate)
 
 /* If NAME is an codeset alias expand it.  */
-extern int __gconv_compare_alias (const char *name1, const char *name2)
-     internal_function;
+extern int __gconv_compare_alias (const char *name1, const char *name2);
 
 
 /* Builtin transformations.  */
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index ff4fd12..d349527 100644
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -27,7 +27,6 @@
 
 
 int
-internal_function
 __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
 	      int flags)
 {
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 1397d2e..35d6eb3 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -113,7 +113,7 @@ static int process_fd (iconv_t cd, int fd, FILE **output,
 		       const char *output_file);
 static int process_file (iconv_t cd, FILE *input, FILE **output,
 			 const char *output_file);
-static void print_known_names (void) internal_function;
+static void print_known_names (void);
 
 
 int
@@ -712,7 +712,6 @@ do_print  (const void *nodep, VISIT value, int level)
 }
 
 static void
-internal_function
 add_known_names (struct gconv_module *node)
 {
   if (node->left != NULL)
@@ -756,7 +755,6 @@ insert_cache (void)
 
 
 static void
-internal_function
 print_known_names (void)
 {
   iconv_t h;
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index 9be4111..9e5e7af 100644
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -566,7 +566,6 @@ new_module (const char *fromname, size_t fromlen, const char *toname,
 
 /* Add new module.  */
 static void
-internal_function
 add_module (char *rp, const char *directory)
 {
   /* We expect now
-- 
cgit v1.1