lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

Remove __libc_readv and __libc_writev function names.

Browse Source 
Continuing the removal of __libc_* function names that are no longer
used anywhere, this patch removes the __libc_readv and __libc_writev
names.

Tested for x86_64 that stripped installed shared libraries are
unchanged by the patch.

	* 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.
This commit is contained in:
Joseph Myers
2014-10-30 20:56:34 +00:00
parent 65b00b6c51
commit e19c95fd5e
7 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -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> 2014-10-30 Roland McGrath <roland@hack.frob.com>
* iconv/iconv_charmap.c (add_bytes): Make IN argument pointer to const. * iconv/iconv_charmap.c (add_bytes): Make IN argument pointer to const.

4
include/sys/uio.h
View File

@ -5,11 +5,7 @@
/* Now define the internal interfaces. */ /* Now define the internal interfaces. */
extern ssize_t __readv (int __fd, const struct iovec *__iovec, extern ssize_t __readv (int __fd, const struct iovec *__iovec,
int __count); 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, extern ssize_t __writev (int __fd, const struct iovec *__iovec,
int __count); int __count);
extern ssize_t __libc_writev (int __fd, const struct iovec *__iovec,
int __count);
#endif #endif
#endif #endif

5
misc/readv.c
View File

@ -25,7 +25,7 @@
Operates just like `read' (see <unistd.h>) except that data are Operates just like `read' (see <unistd.h>) except that data are
put in VECTOR instead of a contiguous buffer. */ put in VECTOR instead of a contiguous buffer. */
ssize_t ssize_t
__libc_readv (fd, vector, count) __readv (fd, vector, count)
int fd; int fd;
const struct iovec *vector; const struct iovec *vector;
int count; int count;
@ -33,7 +33,6 @@ __libc_readv (fd, vector, count)
__set_errno (ENOSYS); __set_errno (ENOSYS);
return -1; return -1;
} }
strong_alias (__libc_readv, __readv) weak_alias (__readv, readv)
weak_alias (__libc_readv, readv)
stub_warning (readv) stub_warning (readv)

5
misc/writev.c
View File

@ -25,7 +25,7 @@
Operates just like `write' (see <unistd.h>) except that the data Operates just like `write' (see <unistd.h>) except that the data
are taken from VECTOR instead of a contiguous buffer. */ are taken from VECTOR instead of a contiguous buffer. */
ssize_t ssize_t
__libc_writev (fd, vector, count) __writev (fd, vector, count)
int fd; int fd;
const struct iovec *vector; const struct iovec *vector;
int count; int count;
@ -33,7 +33,6 @@ __libc_writev (fd, vector, count)
__set_errno (ENOSYS); __set_errno (ENOSYS);
return -1; return -1;
} }
strong_alias (__libc_writev, __writev) weak_alias (__writev, writev)
weak_alias (__libc_writev, writev)
stub_warning (writev) stub_warning (writev)

7
sysdeps/posix/readv.c
View File

@ -37,7 +37,7 @@ ifree (char **ptrp)
Operates just like 'read' (see <unistd.h>) except that data are Operates just like 'read' (see <unistd.h>) except that data are
put in VECTOR instead of a contiguous buffer. */ put in VECTOR instead of a contiguous buffer. */
ssize_t 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. */ /* Find the total number of bytes to be read. */
size_t bytes = 0; size_t bytes = 0;
@ -88,7 +88,4 @@ __libc_readv (int fd, const struct iovec *vector, int count)
return bytes_read; return bytes_read;
} }
#ifndef __libc_readv weak_alias (__readv, readv)
strong_alias (__libc_readv, __readv)
weak_alias (__libc_readv, readv)
#endif

7
sysdeps/posix/writev.c
View File

@ -38,7 +38,7 @@ ifree (char **ptrp)
Operates just like 'write' (see <unistd.h>) except that the data Operates just like 'write' (see <unistd.h>) except that the data
are taken from VECTOR instead of a contiguous buffer. */ are taken from VECTOR instead of a contiguous buffer. */
ssize_t 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. */ /* Find the total number of bytes to be written. */
size_t bytes = 0; size_t bytes = 0;
@ -88,7 +88,4 @@ __libc_writev (int fd, const struct iovec *vector, int count)
return bytes_written; return bytes_written;
} }
#ifndef __libc_writev weak_alias (__writev, writev)
strong_alias (__libc_writev, __writev)
weak_alias (__libc_writev, writev)
#endif

4
sysdeps/unix/syscalls.list
View File

@ -52,7 +52,7 @@ profil - profil i:piii __profil profil
ptrace - ptrace i:iiii ptrace ptrace - ptrace i:iiii ptrace
read - read Ci:ibn __libc_read __read read read - read Ci:ibn __libc_read __read read
readlink - readlink i:spi __readlink readlink 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 reboot - reboot i:i reboot
recv - recv Ci:ibni __libc_recv recv recv - recv Ci:ibni __libc_recv recv
recvfrom - recvfrom Ci:ibniBN __libc_recvfrom __recvfrom recvfrom recvfrom - recvfrom Ci:ibniBN __libc_recvfrom __recvfrom recvfrom
@ -99,4 +99,4 @@ unlink - unlink i:s __unlink unlink
utimes - utimes i:sp __utimes utimes utimes - utimes i:sp __utimes utimes
vhangup - vhangup i:i vhangup vhangup - vhangup i:i vhangup
write - write Ci:ibn __libc_write __write write write - write Ci:ibn __libc_write __write write
writev - writev Ci:ipi __libc_writev __writev writev writev - writev Ci:ipi __writev writev