[PATCH COMMITTED] inet: Remove internal_function attribute

[fweimer at redhat dot com (Florian Weimer)]

2017-08-31  Florian Weimer  <fweimer@redhat.com>

	* inet/deadline.c (__deadline_current_time)
	(__deadline_from_timeval, __deadline_to_ms): Remove
	internal_function.
	* inet/getnameinfo.c (nrl_domainname): Likewise.
	* inet/getnetgrent_r.c (__internal_setnetgrent_reuse): Likewise.
	* inet/inet6_option.c (add_pad): Likewise.
	* inet/net-internal.h (__deadline_current_time)
	(__deadline_from_timeval, __deadline_to_ms): Likewise.
	* inet/rcmd.c (__checkhost_sa, __icheckuser): Likewise.
	* sysdeps/mach/hurd/if_index.c (__protocol_available): Likewise.
	* sysdeps/unix/sysv/linux/ifaddrs.c (map_newlink): Likewise.

diff --git a/inet/deadline.c b/inet/deadline.c
index c1fa415a39..5893f2206a 100644
--- a/inet/deadline.c
+++ b/inet/deadline.c
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <time.h>
 
-struct deadline_current_time internal_function
+struct deadline_current_time
 __deadline_current_time (void)
 {
   struct deadline_current_time result;
@@ -48,7 +48,7 @@ infinite_deadline (void)
   return (struct deadline) { { -1, -1 } };
 }
 
-struct deadline internal_function
+struct deadline
 __deadline_from_timeval (struct deadline_current_time current,
                          struct timeval tv)
 {
@@ -79,7 +79,7 @@ __deadline_from_timeval (struct deadline_current_time current,
   return (struct deadline) { { sec, nsec } };
 }
 
-int internal_function
+int
 __deadline_to_ms (struct deadline_current_time current,
                   struct deadline deadline)
 {
diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index 5d2b9b7559..b41e555f3c 100644
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -86,7 +86,6 @@ libc_freeres_ptr (static char *domain);
 
 
 static char *
-internal_function
 nrl_domainname (void)
 {
   static int not_first;
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 89fefeb612..de5c50483c 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -110,7 +110,6 @@ endnetgrent_hook (struct __netgrent *datap)
 }
 
 static int
-internal_function
 __internal_setnetgrent_reuse (const char *group, struct __netgrent *datap,
 			      int *errnop)
 {
diff --git a/inet/inet6_option.c b/inet/inet6_option.c
index f6d9b5dffe..b37db47dbb 100644
--- a/inet/inet6_option.c
+++ b/inet/inet6_option.c
@@ -24,7 +24,6 @@
 
 
 static void
-internal_function
 add_pad (struct cmsghdr *cmsg, int len)
 {
   unsigned char *p = CMSG_DATA (cmsg) + cmsg->cmsg_len - CMSG_LEN (0);
diff --git a/inet/net-internal.h b/inet/net-internal.h
index b2135893e8..74ee8bccd9 100644
--- a/inet/net-internal.h
+++ b/inet/net-internal.h
@@ -53,8 +53,7 @@ struct deadline_current_time
 
 /* Return the current time.  Terminates the process if the current
    time is not available.  */
-struct deadline_current_time __deadline_current_time (void)
-  internal_function attribute_hidden;
+struct deadline_current_time __deadline_current_time (void) attribute_hidden;
 
 /* Computed absolute deadline.  */
 struct deadline
@@ -97,15 +96,14 @@ __deadline_first (struct deadline left, struct deadline right)
 /* Add TV to the current time and return it.  Returns a special
    infinite absolute deadline on overflow.  */
 struct deadline __deadline_from_timeval (struct deadline_current_time,
-                                         struct timeval tv)
-  internal_function attribute_hidden;
+                                         struct timeval tv) attribute_hidden;
 
 /* Compute the number of milliseconds until the specified deadline,
    from the current time in the argument.  The result is mainly for
    use with poll.  If the deadline has already passed, return 0.  If
    the result would overflow an int, return INT_MAX.  */
 int __deadline_to_ms (struct deadline_current_time, struct deadline)
-  internal_function attribute_hidden;
+  attribute_hidden;
 
 /* Return true if TV.tv_sec is non-negative and TV.tv_usec is in the
    interval [0, 999999].  */
diff --git a/inet/rcmd.c b/inet/rcmd.c
index 976894c2c5..8a9616f847 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -646,7 +646,6 @@ __ivaliduser (FILE *hostf, uint32_t raddr, const char *luser,
 
 /* Returns 1 on positive match, 0 on no match, -1 on negative match.  */
 static int
-internal_function
 __checkhost_sa (struct sockaddr *ra, size_t ralen, char *lhost,
 		const char *rhost)
 {
@@ -700,7 +699,6 @@ __checkhost_sa (struct sockaddr *ra, size_t ralen, char *lhost,
 
 /* Returns 1 on positive match, 0 on no match, -1 on negative match.  */
 static int
-internal_function
 __icheckuser (const char *luser, const char *ruser)
 {
     /*
diff --git a/sysdeps/mach/hurd/if_index.c b/sysdeps/mach/hurd/if_index.c
index 2b9041a3ba..5cd8244698 100644
--- a/sysdeps/mach/hurd/if_index.c
+++ b/sysdeps/mach/hurd/if_index.c
@@ -187,7 +187,6 @@ libc_hidden_weak (if_indextoname)
 
 #if 0
 void
-internal_function
 __protocol_available (int *have_inet, int *have_inet6)
 {
   *have_inet = _hurd_socket_server (PF_INET, 0) != MACH_PORT_NULL;
diff --git a/sysdeps/unix/sysv/linux/ifaddrs.c b/sysdeps/unix/sysv/linux/ifaddrs.c
index 3bc9902863..f25f67a129 100644
--- a/sysdeps/unix/sysv/linux/ifaddrs.c
+++ b/sysdeps/unix/sysv/linux/ifaddrs.c
@@ -286,7 +286,6 @@ __netlink_open (struct netlink_handle *h)
    Since we get at first all RTM_NEWLINK entries, it can never happen
    that a RTM_NEWADDR index is not known to this map.  */
 static int
-internal_function
 map_newlink (int index, struct ifaddrs_storage *ifas, int *map, int max)
 {
   int i;