From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19713 invoked by alias); 10 Aug 2011 12:23:48 -0000 Received: (qmail 19696 invoked by uid 22791); 10 Aug 2011 12:23:47 -0000 X-SWARE-Spam-Status: No, hits=-6.8 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 10 Aug 2011 12:23:25 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7ACNO6J001389 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Aug 2011 08:23:24 -0400 Received: from hase.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p7ACNMk4006851 for ; Wed, 10 Aug 2011 08:23:24 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Clean up PLT use for scandirat X-Yow: Well, O.K. I'll compromise with my principles because of EXISTENTIAL DESPAIR! Date: Wed, 10 Aug 2011 12:23:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-08/txt/msg00001.txt.bz2 2011-08-10 Andreas Schwab * include/dirent.h: Add libc_hidden_proto for scandirat and scandirat64. Don't declare __scandirat64. * dirent/scandirat.c: Add libc_hidden_def. * dirent/scandirat64.c (SCANDIRAT): Remove underscores. * sysdeps/unix/sysv/linux/i386/scandir64.c (SCANDIRAT): Likewise. --- dirent/scandirat.c | 1 + dirent/scandirat64.c | 4 +--- include/dirent.h | 7 ++----- sysdeps/unix/sysv/linux/i386/scandir64.c | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dirent/scandirat.c b/dirent/scandirat.c index e6f5ece..3eda970 100644 --- a/dirent/scandirat.c +++ b/dirent/scandirat.c @@ -141,3 +141,4 @@ SCANDIRAT (dfd, dir, namelist, select, cmp) return c.cnt; } +libc_hidden_def (SCANDIRAT) diff --git a/dirent/scandirat64.c b/dirent/scandirat64.c index c4afb90..d41bdd1 100644 --- a/dirent/scandirat64.c +++ b/dirent/scandirat64.c @@ -18,11 +18,9 @@ #include -#define SCANDIRAT __scandirat64 +#define SCANDIRAT scandirat64 #define READDIR __readdir64 #define DIRENT_TYPE struct dirent64 #define SKIP_SCANDIR_CANCEL 1 #include "scandirat.c" - -weak_alias (__scandirat64, scandirat64) diff --git a/include/dirent.h b/include/dirent.h index 9ed5876..7dbf622 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -27,11 +27,6 @@ extern int __scandir64 (__const char * __dir, int (*__selector) (__const struct dirent64 *), int (*__cmp) (__const struct dirent64 **, __const struct dirent64 **)); -extern int __scandirat64 (int __dfd, __const char * __dir, - struct dirent64 *** __namelist, - int (*__selector) (__const struct dirent64 *), - int (*__cmp) (__const struct dirent64 **, - __const struct dirent64 **)); extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes) internal_function; extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes) @@ -47,5 +42,7 @@ extern DIR *__alloc_dir (int fd, bool close_fd, int flags, extern void __scandir_cancel_handler (void *arg); libc_hidden_proto (rewinddir) +libc_hidden_proto (scandirat) +libc_hidden_proto (scandirat64) #endif diff --git a/sysdeps/unix/sysv/linux/i386/scandir64.c b/sysdeps/unix/sysv/linux/i386/scandir64.c index dacac0a..ae1970e 100644 --- a/sysdeps/unix/sysv/linux/i386/scandir64.c +++ b/sysdeps/unix/sysv/linux/i386/scandir64.c @@ -19,7 +19,7 @@ #include #define SCANDIR __scandir64 -#define SCANDIRAT __scandirat64 +#define SCANDIRAT scandirat64 #define READDIR __readdir64 #define DIRENT_TYPE struct dirent64 #define SKIP_SCANDIR_CANCEL 1 -- 1.7.6 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."