diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | include/sys/uio.h | 4 | ||||
| -rw-r--r-- | misc/readv.c | 5 | ||||
| -rw-r--r-- | misc/writev.c | 5 | ||||
| -rw-r--r-- | sysdeps/posix/readv.c | 7 | ||||
| -rw-r--r-- | sysdeps/posix/writev.c | 7 | ||||
| -rw-r--r-- | sysdeps/unix/syscalls.list | 4 |
7 files changed, 30 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index b3eaf53e21..44920af672 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2014-10-30 Joseph Myers <joseph@codesourcery.com> + + * include/sys/uio.h (__libc_readv): Remove declaration. + (__libc_writev): Likewise. + * misc/readv.c (__libc_readv): Rename to __readv. + (__readv): Do not define as alias. + (readv): Define as alias of __readv. + * misc/writev.c (__libc_writev): Rename to __writev. + (__writev): Do not define as alias. + (writev): Define as alias of __writev. + * sysdeps/posix/readv.c (__libc_readv): Rename to __readv. + (__readv): Do not define as alias. + (readv): Define unconditionally as alias of __readv. + * sysdeps/posix/writev.c (__libc_writev): Rename to __writev. + (__writev): Do not define as alias. + (writev): Define unconditionally as alias of __writev. + * sysdeps/unix/syscalls.list (readv): Do not define __libc_readv + name. + (writev): Do not define __libc_writev name. + 2014-10-30 Roland McGrath <roland@hack.frob.com> * iconv/iconv_charmap.c (add_bytes): Make IN argument pointer to const. diff --git a/include/sys/uio.h b/include/sys/uio.h index 7d67d67c0a..f44ce182ba 100644 --- a/include/sys/uio.h +++ b/include/sys/uio.h @@ -5,11 +5,7 @@ /* Now define the internal interfaces. */ extern ssize_t __readv (int __fd, const struct iovec *__iovec, int __count); -extern ssize_t __libc_readv (int __fd, const struct iovec *__iovec, - int __count); extern ssize_t __writev (int __fd, const struct iovec *__iovec, int __count); -extern ssize_t __libc_writev (int __fd, const struct iovec *__iovec, - int __count); #endif #endif diff --git a/misc/readv.c b/misc/readv.c index 5cc24eba25..a624e789cd 100644 --- a/misc/readv.c +++ b/misc/readv.c @@ -25,7 +25,7 @@ Operates just like `read' (see <unistd.h>) except that data are put in VECTOR instead of a contiguous buffer. */ ssize_t -__libc_readv (fd, vector, count) +__readv (fd, vector, count) int fd; const struct iovec *vector; int count; @@ -33,7 +33,6 @@ __libc_readv (fd, vector, count) __set_errno (ENOSYS); return -1; } -strong_alias (__libc_readv, __readv) -weak_alias (__libc_readv, readv) +weak_alias (__readv, readv) stub_warning (readv) diff --git a/misc/writev.c b/misc/writev.c index b703aacd9a..f2eb92cbb4 100644 --- a/misc/writev.c +++ b/misc/writev.c @@ -25,7 +25,7 @@ Operates just like `write' (see <unistd.h>) except that the data are taken from VECTOR instead of a contiguous buffer. */ ssize_t -__libc_writev (fd, vector, count) +__writev (fd, vector, count) int fd; const struct iovec *vector; int count; @@ -33,7 +33,6 @@ __libc_writev (fd, vector, count) __set_errno (ENOSYS); return -1; } -strong_alias (__libc_writev, __writev) -weak_alias (__libc_writev, writev) +weak_alias (__writev, writev) stub_warning (writev) diff --git a/sysdeps/posix/readv.c b/sysdeps/posix/readv.c index b7a8e1e7c2..59e4caad0d 100644 --- a/sysdeps/posix/readv.c +++ b/sysdeps/posix/readv.c @@ -37,7 +37,7 @@ ifree (char **ptrp) Operates just like 'read' (see <unistd.h>) except that data are put in VECTOR instead of a contiguous buffer. */ ssize_t -__libc_readv (int fd, const struct iovec *vector, int count) +__readv (int fd, const struct iovec *vector, int count) { /* Find the total number of bytes to be read. */ size_t bytes = 0; @@ -88,7 +88,4 @@ __libc_readv (int fd, const struct iovec *vector, int count) return bytes_read; } -#ifndef __libc_readv -strong_alias (__libc_readv, __readv) -weak_alias (__libc_readv, readv) -#endif +weak_alias (__readv, readv) diff --git a/sysdeps/posix/writev.c b/sysdeps/posix/writev.c index ef0058e25e..5ea5d058f7 100644 --- a/sysdeps/posix/writev.c +++ b/sysdeps/posix/writev.c @@ -38,7 +38,7 @@ ifree (char **ptrp) Operates just like 'write' (see <unistd.h>) except that the data are taken from VECTOR instead of a contiguous buffer. */ ssize_t -__libc_writev (int fd, const struct iovec *vector, int count) +__writev (int fd, const struct iovec *vector, int count) { /* Find the total number of bytes to be written. */ size_t bytes = 0; @@ -88,7 +88,4 @@ __libc_writev (int fd, const struct iovec *vector, int count) return bytes_written; } -#ifndef __libc_writev -strong_alias (__libc_writev, __writev) -weak_alias (__libc_writev, writev) -#endif +weak_alias (__writev, writev) diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list index 0b3c1b9169..b3358bd933 100644 --- a/sysdeps/unix/syscalls.list +++ b/sysdeps/unix/syscalls.list @@ -52,7 +52,7 @@ profil - profil i:piii __profil profil ptrace - ptrace i:iiii ptrace read - read Ci:ibn __libc_read __read read readlink - readlink i:spi __readlink readlink -readv - readv Ci:ipi __libc_readv __readv readv +readv - readv Ci:ipi __readv readv reboot - reboot i:i reboot recv - recv Ci:ibni __libc_recv recv recvfrom - recvfrom Ci:ibniBN __libc_recvfrom __recvfrom recvfrom @@ -99,4 +99,4 @@ unlink - unlink i:s __unlink unlink utimes - utimes i:sp __utimes utimes vhangup - vhangup i:i vhangup write - write Ci:ibn __libc_write __write write -writev - writev Ci:ipi __libc_writev __writev writev +writev - writev Ci:ipi __writev writev |