picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up PLT use for scandirat

This commit is contained in:
Andreas Schwab 2011-08-11 11:41:09 -04:00 committed by Ulrich Drepper
parent a724d1b9bf
commit 14d9678512
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2011-08-10 Andreas Schwab <schwab@redhat.com>
* 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.
2011-08-09 Ulrich Drepper <drepper@gmail.com>
* Versions.def [libc]: Add GLIBC_2.15.

1
dirent/scandirat.c
View File

@ -141,3 +141,4 @@ SCANDIRAT (dfd, dir, namelist, select, cmp)
return c.cnt;
}
libc_hidden_def (SCANDIRAT)

4
dirent/scandirat64.c
View File

@ -18,11 +18,9 @@
#include <dirent.h>
#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)

7
include/dirent.h
View File

@ -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

2
sysdeps/unix/sysv/linux/i386/scandir64.c
View File

@ -19,7 +19,7 @@
#include <dirent.h>
#define SCANDIR __scandir64
#define SCANDIRAT __scandirat64
#define SCANDIRAT scandirat64
#define READDIR __readdir64
#define DIRENT_TYPE struct dirent64
#define SKIP_SCANDIR_CANCEL 1