summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--resolv/gai_misc.c3
-rw-r--r--resolv/gai_misc.h18
-rw-r--r--resolv/gai_notify.c2
-rw-r--r--resolv/gai_sigqueue.c1
-rw-r--r--resolv/inet_ntop.c8
-rw-r--r--sysdeps/unix/sysv/linux/gai_sigqueue.c1
7 files changed, 21 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index eb939245c4..d5bc75dbd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2017-08-31 Florian Weimer <fweimer@redhat.com>
+ * resolv/gai_misc.c (__gai_find_request, __gai_remove_request)
+ (__gai_enqueue_request): Remove internal_function.
+ * resolv/gai_misc.h (__gai_enqueue_request, __gai_find_request)
+ (__gai_remove_request, __gai_notify, __gai_notify_only)
+ (__gai_sigqueue): Likewise.
+ * resolv/gai_notify.c (__gai_notify_only, __gai_notify): Likewise.
+ * resolv/gai_sigqueue.c (__gai_sigqueue): Likewise.
+ * resolv/inet_ntop.c (inet_ntop4, inet_ntop6): Likewise.
+ * sysdeps/unix/sysv/linux/gai_sigqueue.c (__gai_sigqueue):
+ Likewise.
+
+2017-08-31 Florian Weimer <fweimer@redhat.com>
+
* dirent/scandir-tail.c (SCANDIR_TAIL): Remove internal_function.
* include/dirent.h (__opendirat, __getdents, __getdents64)
(__alloc_dir, __scandir_tail, __scandir64_tail): Likewise.
diff --git a/resolv/gai_misc.c b/resolv/gai_misc.c
index fd9aa356be..b611ae0b97 100644
--- a/resolv/gai_misc.c
+++ b/resolv/gai_misc.c
@@ -152,7 +152,6 @@ get_elem (void)
struct requestlist *
-internal_function
__gai_find_request (const struct gaicb *gaicbp)
{
struct requestlist *runp;
@@ -169,7 +168,6 @@ __gai_find_request (const struct gaicb *gaicbp)
int
-internal_function
__gai_remove_request (struct gaicb *gaicbp)
{
struct requestlist *runp;
@@ -212,7 +210,6 @@ static void *handle_requests (void *arg);
/* The main function of the async I/O handling. It enqueues requests
and if necessary starts and handles threads. */
struct requestlist *
-internal_function
__gai_enqueue_request (struct gaicb *gaicbp)
{
struct requestlist *newp;
diff --git a/resolv/gai_misc.h b/resolv/gai_misc.h
index 6679d2b7d5..95d14ed54f 100644
--- a/resolv/gai_misc.h
+++ b/resolv/gai_misc.h
@@ -75,27 +75,21 @@ extern pthread_mutex_t __gai_requests_mutex;
/* Enqueue request. */
-extern struct requestlist *__gai_enqueue_request (struct gaicb *gaicbp)
- internal_function;
+extern struct requestlist *__gai_enqueue_request (struct gaicb *gaicbp);
/* Find request on wait list. */
-extern struct requestlist *__gai_find_request (const struct gaicb *gaicbp)
- internal_function;
+extern struct requestlist *__gai_find_request (const struct gaicb *gaicbp);
/* Remove request from waitlist. */
-extern int __gai_remove_request (struct gaicb *gaicbp)
- internal_function;
+extern int __gai_remove_request (struct gaicb *gaicbp);
/* Notify initiator of request and tell this everybody listening. */
-extern void __gai_notify (struct requestlist *req)
- internal_function;
+extern void __gai_notify (struct requestlist *req);
/* Notify initiator of request. */
-extern int __gai_notify_only (struct sigevent *sigev, pid_t caller_pid)
- internal_function;
+extern int __gai_notify_only (struct sigevent *sigev, pid_t caller_pid);
/* Send the signal. */
-extern int __gai_sigqueue (int sig, const union sigval val, pid_t caller_pid)
- internal_function;
+extern int __gai_sigqueue (int sig, const union sigval val, pid_t caller_pid);
#endif /* gai_misc.h */
diff --git a/resolv/gai_notify.c b/resolv/gai_notify.c
index 2056aee5e8..50597fcb8b 100644
--- a/resolv/gai_notify.c
+++ b/resolv/gai_notify.c
@@ -42,7 +42,6 @@ notify_func_wrapper (void *arg)
int
-internal_function
__gai_notify_only (struct sigevent *sigev, pid_t caller_pid)
{
int result = 0;
@@ -94,7 +93,6 @@ __gai_notify_only (struct sigevent *sigev, pid_t caller_pid)
void
-internal_function
__gai_notify (struct requestlist *req)
{
struct waitlist *waitlist;
diff --git a/resolv/gai_sigqueue.c b/resolv/gai_sigqueue.c
index ebc1e5ed46..06e1e4d7b2 100644
--- a/resolv/gai_sigqueue.c
+++ b/resolv/gai_sigqueue.c
@@ -22,7 +22,6 @@
#include <gai_misc.h>
int
-internal_function
__gai_sigqueue (int sig, const union sigval val, pid_t caller_pid)
{
__set_errno (ENOSYS);
diff --git a/resolv/inet_ntop.c b/resolv/inet_ntop.c
index 01c45ce8b7..c4d38c0f95 100644
--- a/resolv/inet_ntop.c
+++ b/resolv/inet_ntop.c
@@ -38,10 +38,8 @@
* sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
*/
-static const char *inet_ntop4 (const u_char *src, char *dst, socklen_t size)
- internal_function;
-static const char *inet_ntop6 (const u_char *src, char *dst, socklen_t size)
- internal_function;
+static const char *inet_ntop4 (const u_char *src, char *dst, socklen_t size);
+static const char *inet_ntop6 (const u_char *src, char *dst, socklen_t size);
/* char *
* inet_ntop(af, src, dst, size)
@@ -79,7 +77,6 @@ libc_hidden_def (inet_ntop)
* Paul Vixie, 1996.
*/
static const char *
-internal_function
inet_ntop4 (const u_char *src, char *dst, socklen_t size)
{
static const char fmt[] = "%u.%u.%u.%u";
@@ -99,7 +96,6 @@ inet_ntop4 (const u_char *src, char *dst, socklen_t size)
* Paul Vixie, 1996.
*/
static const char *
-internal_function
inet_ntop6 (const u_char *src, char *dst, socklen_t size)
{
/*
diff --git a/sysdeps/unix/sysv/linux/gai_sigqueue.c b/sysdeps/unix/sysv/linux/gai_sigqueue.c
index 0f7b459b5e..d19562bc58 100644
--- a/sysdeps/unix/sysv/linux/gai_sigqueue.c
+++ b/sysdeps/unix/sysv/linux/gai_sigqueue.c
@@ -30,7 +30,6 @@
/* Return any pending signal or wait for one for the given time. */
int
-internal_function
__gai_sigqueue (int sig, const union sigval val, pid_t caller_pid)
{
siginfo_t info;