From patchwork Thu Oct 30 20:33:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 405130 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9C494140080 for ; Fri, 31 Oct 2014 07:33:46 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=IsE5MQ/vdscUJfvjNlV3KYvLGuFyp b4XYwQ0uCWKMN8Es+PxmTwbbJbq/XzNCIQU2GpUgfPo8CbCNtycEuxqLFQysoroL yyqBpm1brcHSFlB6HIytSawk713TyfnNZDRiVKCiUT1Q7TXqBcpJ47xXyjKzcSpk fPuX4TfaivlChE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=/7Js8tAASkK+5LZRrQl7YHCZVVw=; b=D5L 4fUxIpAfclYg7QhNoN2LG2wb+aRCBFj/1fv/7C8X+huaISRgB4nK9fag+cw8XKU/ OVnPXhdDMFLFOD9iwyVui3iX9HE0SxtIiGLnlr35uUtTj/Nvzq508ijclrs57Br5 wCKm4SNDy01YGkH6O6SIGMUYWCw+NIfC33+IIIOM= Received: (qmail 12541 invoked by alias); 30 Oct 2014 20:33:40 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 12529 invoked by uid 89); 30 Oct 2014 20:33:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Date: Thu, 30 Oct 2014 20:33:32 +0000 From: "Joseph S. Myers" To: Subject: Remove __libc_readv and __libc_writev function names Message-ID: MIME-Version: 1.0 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. 2014-10-30 Joseph Myers * 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. diff --git a/include/sys/uio.h b/include/sys/uio.h index 7d67d67..f44ce18 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 5cc24eb..a624e78 100644 --- a/misc/readv.c +++ b/misc/readv.c @@ -25,7 +25,7 @@ Operates just like `read' (see ) 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 b703aac..f2eb92c 100644 --- a/misc/writev.c +++ b/misc/writev.c @@ -25,7 +25,7 @@ Operates just like `write' (see ) 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 b7a8e1e..59e4caa 100644 --- a/sysdeps/posix/readv.c +++ b/sysdeps/posix/readv.c @@ -37,7 +37,7 @@ ifree (char **ptrp) Operates just like 'read' (see ) 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 ef0058e..5ea5d05 100644 --- a/sysdeps/posix/writev.c +++ b/sysdeps/posix/writev.c @@ -38,7 +38,7 @@ ifree (char **ptrp) Operates just like 'write' (see ) 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 0b3c1b9..b3358bd 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