qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dirent: Remove internal_function attribute

This commit is contained in:
Florian Weimer 2017-08-31 16:02:40 +02:00
parent 18c54facf1
commit fc3d94979e
7 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2017-08-31 Florian Weimer <fweimer@redhat.com>
* dirent/scandir-tail.c (SCANDIR_TAIL): Remove internal_function.
* include/dirent.h (__opendirat, __getdents, __getdents64)
(__alloc_dir, __scandir_tail, __scandir64_tail): Likewise.
* sysdeps/posix/opendir.c (__opendirat, __alloc_dir): Likewise.
* sysdeps/mach/hurd/opendir.c (__opendirat): Likewise.
* sysdeps/unix/sysv/linux/i386/olddirent.h (__old_getdents64):
Likewise.
* sysdeps/unix/sysv/linux/getdents.c (__GETDENTS): Likewise.
2017-08-31 Florian Weimer <fweimer@redhat.com> 2017-08-31 Florian Weimer <fweimer@redhat.com>
* sysdeps/unix/sysv/linux/getcwd.c (generic_getcwd): Remove * sysdeps/unix/sysv/linux/getcwd.c (generic_getcwd): Remove

1
dirent/scandir-tail.c
View File

@ -28,7 +28,6 @@
# define DIRENT_TYPE struct dirent # define DIRENT_TYPE struct dirent
#endif #endif
internal_function
int int
SCANDIR_TAIL (DIR *dp, SCANDIR_TAIL (DIR *dp,
DIRENT_TYPE ***namelist, DIRENT_TYPE ***namelist,

14
include/dirent.h
View File

@ -16,8 +16,7 @@ struct scandir_cancel_struct
/* Now define the internal interfaces. */ /* Now define the internal interfaces. */
extern DIR *__opendir (const char *__name); extern DIR *__opendir (const char *__name);
extern DIR *__opendirat (int dfd, const char *__name) extern DIR *__opendirat (int dfd, const char *__name) attribute_hidden;
internal_function attribute_hidden;
extern DIR *__fdopendir (int __fd); extern DIR *__fdopendir (int __fd);
extern int __closedir (DIR *__dirp); extern int __closedir (DIR *__dirp);
extern struct dirent *__readdir (DIR *__dirp); extern struct dirent *__readdir (DIR *__dirp);
@ -36,17 +35,16 @@ extern __ssize_t __getdirentries (int __fd, char *__restrict __buf,
__off_t *__restrict __basep) __off_t *__restrict __basep)
__THROW __nonnull ((2, 4)); __THROW __nonnull ((2, 4));
extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes) extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes)
internal_function attribute_hidden; attribute_hidden;
extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes) extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes)
internal_function attribute_hidden; attribute_hidden;
extern int __alphasort64 (const struct dirent64 **a, const struct dirent64 **b) extern int __alphasort64 (const struct dirent64 **a, const struct dirent64 **b)
__attribute_pure__; __attribute_pure__;
extern int __versionsort64 (const struct dirent64 **a, extern int __versionsort64 (const struct dirent64 **a,
const struct dirent64 **b) const struct dirent64 **b)
__attribute_pure__; __attribute_pure__;
extern DIR *__alloc_dir (int fd, bool close_fd, int flags, extern DIR *__alloc_dir (int fd, bool close_fd, int flags,
const struct stat64 *statp) const struct stat64 *statp) attribute_hidden;
internal_function attribute_hidden;
extern __typeof (rewinddir) __rewinddir; extern __typeof (rewinddir) __rewinddir;
extern void __scandir_cancel_handler (void *arg) attribute_hidden; extern void __scandir_cancel_handler (void *arg) attribute_hidden;
@ -55,7 +53,7 @@ extern int __scandir_tail (DIR *dp,
int (*select) (const struct dirent *), int (*select) (const struct dirent *),
int (*cmp) (const struct dirent **, int (*cmp) (const struct dirent **,
const struct dirent **)) const struct dirent **))
internal_function attribute_hidden; attribute_hidden;
# ifdef _DIRENT_MATCHES_DIRENT64 # ifdef _DIRENT_MATCHES_DIRENT64
# define __scandir64_tail (dp, namelist, select, cmp) \ # define __scandir64_tail (dp, namelist, select, cmp) \
__scandir_tail (dp, (struct dirent ***) (namelist), \ __scandir_tail (dp, (struct dirent ***) (namelist), \
@ -68,7 +66,7 @@ extern int __scandir64_tail (DIR *dp,
int (*select) (const struct dirent64 *), int (*select) (const struct dirent64 *),
int (*cmp) (const struct dirent64 **, int (*cmp) (const struct dirent64 **,
const struct dirent64 **)) const struct dirent64 **))
internal_function attribute_hidden; attribute_hidden;
# endif # endif
libc_hidden_proto (__rewinddir) libc_hidden_proto (__rewinddir)

1
sysdeps/mach/hurd/opendir.c
View File

@ -69,7 +69,6 @@ _hurd_fd_opendir (struct hurd_fd *d)
DIR * DIR *
internal_function
__opendirat (int dfd, const char *name) __opendirat (int dfd, const char *name)
{ {
if (name[0] == '\0') if (name[0] == '\0')

2
sysdeps/posix/opendir.c
View File

@ -139,7 +139,6 @@ opendir_tail (int fd)
#if IS_IN (libc) #if IS_IN (libc)
DIR * DIR *
internal_function
__opendirat (int dfd, const char *name) __opendirat (int dfd, const char *name)
{ {
if (__glibc_unlikely (invalid_name (name))) if (__glibc_unlikely (invalid_name (name)))
@ -193,7 +192,6 @@ __opendir (const char *name)
weak_alias (__opendir, opendir) weak_alias (__opendir, opendir)
DIR * DIR *
internal_function
__alloc_dir (int fd, bool close_fd, int flags, const struct stat64 *statp) __alloc_dir (int fd, bool close_fd, int flags, const struct stat64 *statp)
{ {
/* We have to set the close-on-exit flag if the user provided the /* We have to set the close-on-exit flag if the user provided the

1
sysdeps/unix/sysv/linux/getdents.c
View File

@ -76,7 +76,6 @@ struct kernel_dirent64
reset the file descriptor. In practice the kernel is limiting the reset the file descriptor. In practice the kernel is limiting the
amount of data returned much more then the reduced buffer size. */ amount of data returned much more then the reduced buffer size. */
ssize_t ssize_t
internal_function
__GETDENTS (int fd, char *buf, size_t nbytes) __GETDENTS (int fd, char *buf, size_t nbytes)
{ {
ssize_t retval; ssize_t retval;

3
sysdeps/unix/sysv/linux/i386/olddirent.h
View File

@ -34,8 +34,7 @@ extern struct __old_dirent64 *__old_readdir64 (DIR *__dirp);
libc_hidden_proto (__old_readdir64); libc_hidden_proto (__old_readdir64);
extern int __old_readdir64_r (DIR *__dirp, struct __old_dirent64 *__entry, extern int __old_readdir64_r (DIR *__dirp, struct __old_dirent64 *__entry,
struct __old_dirent64 **__result); struct __old_dirent64 **__result);
extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes) extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes);
internal_function;
int __old_scandir64 (const char * __dir, int __old_scandir64 (const char * __dir,
struct __old_dirent64 *** __namelist, struct __old_dirent64 *** __namelist,
int (*__selector) (const struct __old_dirent64 *), int (*__selector) (const struct __old_dirent64 *),