NSS: Remove internal_function function attribute

9 files changed, 23 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index b49e2bdf2d..d508605dfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2017-08-31  Florian Weimer  <fweimer@redhat.com>
 
+	* include/nss.h (__nss_valid_field, __nss_valid_list_field)
+	(__nss_rewrite_field): Remove internal_function.
+	* nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise.
+	* nscd/nscd_gethst_r.c (nscd_gethst_r): Likewise.
+	* nscd/nscd_getpw_r.c (nscd_getpw_r): Likewise.
+	* nss/nsswitch.c (nss_parse_file, nss_getline)
+	(nss_parse_service_list, nss_new_service): Likewise.
+	* nss/rewrite_field.c (__nss_rewrite_field): Likewise.
+	* nss/valid_field.c (__nss_valid_field): Likewise.
+	* nss/valid_list_field.c (__nss_valid_list_field): Likewise.
+
+2017-08-31  Florian Weimer  <fweimer@redhat.com>
+
 	* malloc/arena.c (__malloc_fork_lock_parent)
 	(__malloc_fork_unlock_parent, __malloc_fork_unlock_child)
 	(next_env_entry, new_heap, heap_trim, arena_get2): Remove
diff --git a/include/nss.h b/include/nss.h
index 6358a10fd3..5f29de7f84 100644
--- a/include/nss.h
+++ b/include/nss.h
@@ -6,12 +6,10 @@
 #define NSS_INVALID_FIELD_CHARACTERS ":\n"
 extern const char __nss_invalid_field_characters[] attribute_hidden;
 
-_Bool __nss_valid_field (const char *value)
-  attribute_hidden internal_function;
-_Bool __nss_valid_list_field (char **list)
-  attribute_hidden internal_function;
+_Bool __nss_valid_field (const char *value) attribute_hidden;
+_Bool __nss_valid_list_field (char **list)  attribute_hidden;
 const char *__nss_rewrite_field (const char *value, char **to_be_freed)
-  attribute_hidden internal_function;
+  attribute_hidden;
 
 # endif /* !_ISOMAC */
 #endif /* _NSS_H */
diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c
index 1f6026101b..1a8e57ad90 100644
--- a/nscd/nscd_getgr_r.c
+++ b/nscd/nscd_getgr_r.c
@@ -40,8 +40,7 @@ int __nss_not_use_nscd_group;
 
 static int nscd_getgr_r (const char *key, size_t keylen, request_type type,
 			 struct group *resultbuf, char *buffer,
-			 size_t buflen, struct group **result)
-     internal_function;
+			 size_t buflen, struct group **result);
 
 
 int
@@ -82,7 +81,6 @@ libc_freeres_fn (gr_map_free)
 
 
 static int
-internal_function
 nscd_getgr_r (const char *key, size_t keylen, request_type type,
 	      struct group *resultbuf, char *buffer, size_t buflen,
 	      struct group **result)
diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
index e234c7f2f3..5ace03635b 100644
--- a/nscd/nscd_gethst_r.c
+++ b/nscd/nscd_gethst_r.c
@@ -32,7 +32,7 @@ int __nss_not_use_nscd_hosts;
 static int nscd_gethst_r (const char *key, size_t keylen, request_type type,
 			  struct hostent *resultbuf, char *buffer,
 			  size_t buflen, struct hostent **result,
-			  int *h_errnop) internal_function;
+			  int *h_errnop);
 
 
 int
@@ -135,7 +135,6 @@ __nscd_get_nl_timestamp (void)
 int __nss_have_localdomain attribute_hidden;
 
 static int
-internal_function
 nscd_gethst_r (const char *key, size_t keylen, request_type type,
 	       struct hostent *resultbuf, char *buffer, size_t buflen,
 	       struct hostent **result, int *h_errnop)
diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
index fbece1c99a..47aaf566d2 100644
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@@ -38,8 +38,7 @@ int __nss_not_use_nscd_passwd;
 
 static int nscd_getpw_r (const char *key, size_t keylen, request_type type,
 			 struct passwd *resultbuf, char *buffer,
-			 size_t buflen, struct passwd **result)
-     internal_function;
+			 size_t buflen, struct passwd **result);
 
 int
 __nscd_getpwnam_r (const char *name, struct passwd *resultbuf, char *buffer,
@@ -81,7 +80,6 @@ libc_freeres_fn (pw_map_free)
 
 
 static int
-internal_function
 nscd_getpw_r (const char *key, size_t keylen, request_type type,
 	      struct passwd *resultbuf, char *buffer, size_t buflen,
 	      struct passwd **result)
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 834bef6f9c..8a146b956f 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -42,13 +42,12 @@
 #include <sysdep.h>
 
 /* Prototypes for the local functions.  */
-static name_database *nss_parse_file (const char *fname) internal_function;
-static name_database_entry *nss_getline (char *line) internal_function;
-static service_user *nss_parse_service_list (const char *line)
-     internal_function;
+static name_database *nss_parse_file (const char *fname);
+static name_database_entry *nss_getline (char *line);
+static service_user *nss_parse_service_list (const char *line);
 #if !defined DO_STATIC_NSS || defined SHARED
 static service_library *nss_new_service (name_database *database,
-					 const char *name) internal_function;
+					 const char *name);
 #endif
 
 
@@ -532,7 +531,6 @@ libc_hidden_def (__nss_lookup_function)
 
 
 static name_database *
-internal_function
 nss_parse_file (const char *fname)
 {
   FILE *fp;
@@ -608,7 +606,6 @@ nss_parse_file (const char *fname)
 	`( <source> ( "[" "!"? (<status> "=" <action> )+ "]" )? )*'
    */
 static service_user *
-internal_function
 nss_parse_service_list (const char *line)
 {
   service_user *result = NULL, **nextp = &result;
@@ -757,7 +754,6 @@ nss_parse_service_list (const char *line)
 }
 
 static name_database_entry *
-internal_function
 nss_getline (char *line)
 {
   const char *name;
@@ -799,7 +795,6 @@ nss_getline (char *line)
 
 #if !defined DO_STATIC_NSS || defined SHARED
 static service_library *
-internal_function
 nss_new_service (name_database *database, const char *name)
 {
   service_library **currentp = &database->library;
diff --git a/nss/rewrite_field.c b/nss/rewrite_field.c
index c0ae3d23f2..3c456fe22d 100644
--- a/nss/rewrite_field.c
+++ b/nss/rewrite_field.c
@@ -24,7 +24,6 @@
    overwritten with a pointer the caller has to free if the function
    returns successfully.  On failure, return NULL.  */
 const char *
-internal_function
 __nss_rewrite_field (const char *value, char **to_be_freed)
 {
   *to_be_freed = NULL;
diff --git a/nss/valid_field.c b/nss/valid_field.c
index 88c41a81a0..5146b9cce9 100644
--- a/nss/valid_field.c
+++ b/nss/valid_field.c
@@ -24,7 +24,6 @@ const char __nss_invalid_field_characters[] = NSS_INVALID_FIELD_CHARACTERS;
    does not contain characters not permitted in NSS database
    fields.  */
 _Bool
-internal_function
 __nss_valid_field (const char *value)
 {
   return value == NULL
diff --git a/nss/valid_list_field.c b/nss/valid_list_field.c
index 9763c89bcd..1d82519299 100644
--- a/nss/valid_list_field.c
+++ b/nss/valid_list_field.c
@@ -24,7 +24,6 @@ static const char invalid_characters[] = NSS_INVALID_FIELD_CHARACTERS ",";
 /* Check that all list members match the field syntax requirements and
    do not contain the character ','.  */
 _Bool
-internal_function
 __nss_valid_list_field (char **list)
 {
   if (list == NULL)