This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH COMMITTED] dirent: Remove internal_function attribute

2017-08-31  Florian Weimer  <>

	* 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):
	* sysdeps/unix/sysv/linux/getdents.c (__GETDENTS): Likewise.

diff --git a/dirent/scandir-tail.c b/dirent/scandir-tail.c
index 7810fb4d42..068c644c4e 100644
--- a/dirent/scandir-tail.c
+++ b/dirent/scandir-tail.c
@@ -28,7 +28,6 @@
 # define DIRENT_TYPE	struct dirent
               DIRENT_TYPE ***namelist,
diff --git a/include/dirent.h b/include/dirent.h
index c792e53c96..bebcd52cdb 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -16,8 +16,7 @@ struct scandir_cancel_struct
 /* Now define the internal interfaces.  */
 extern DIR *__opendir (const char *__name);
-extern DIR *__opendirat (int dfd, const char *__name)
-     internal_function attribute_hidden;
+extern DIR *__opendirat (int dfd, const char *__name) attribute_hidden;
 extern DIR *__fdopendir (int __fd);
 extern int __closedir (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)
      __THROW __nonnull ((2, 4));
 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)
-     internal_function attribute_hidden;
+     attribute_hidden;
 extern int __alphasort64 (const struct dirent64 **a, const struct dirent64 **b)
 extern int __versionsort64 (const struct dirent64 **a,
 			    const struct dirent64 **b)
 extern DIR *__alloc_dir (int fd, bool close_fd, int flags,
-			 const struct stat64 *statp)
-     internal_function attribute_hidden;
+			 const struct stat64 *statp) attribute_hidden;
 extern __typeof (rewinddir) __rewinddir;
 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 (*cmp) (const struct dirent **,
 				       const struct dirent **))
-  internal_function attribute_hidden;
+  attribute_hidden;
 #   define __scandir64_tail (dp, namelist, select, cmp)         \
   __scandir_tail (dp, (struct dirent ***) (namelist),           \
@@ -68,7 +66,7 @@ extern int __scandir64_tail (DIR *dp,
 			     int (*select) (const struct dirent64 *),
 			     int (*cmp) (const struct dirent64 **,
 					 const struct dirent64 **))
-  internal_function attribute_hidden;
+  attribute_hidden;
 #  endif
 libc_hidden_proto (__rewinddir)
diff --git a/sysdeps/mach/hurd/opendir.c b/sysdeps/mach/hurd/opendir.c
index d3757f00fa..2e1d1a07b2 100644
--- a/sysdeps/mach/hurd/opendir.c
+++ b/sysdeps/mach/hurd/opendir.c
@@ -69,7 +69,6 @@ _hurd_fd_opendir (struct hurd_fd *d)
 DIR *
 __opendirat (int dfd, const char *name)
   if (name[0] == '\0')
diff --git a/sysdeps/posix/opendir.c b/sysdeps/posix/opendir.c
index 880ebc904c..99869b4eb4 100644
--- a/sysdeps/posix/opendir.c
+++ b/sysdeps/posix/opendir.c
@@ -139,7 +139,6 @@ opendir_tail (int fd)
 #if IS_IN (libc)
 DIR *
 __opendirat (int dfd, const char *name)
   if (__glibc_unlikely (invalid_name (name)))
@@ -193,7 +192,6 @@ __opendir (const char *name)
 weak_alias (__opendir, opendir)
 DIR *
 __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
diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c
index 4794eb737d..fb2bc1c056 100644
--- a/sysdeps/unix/sysv/linux/getdents.c
+++ b/sysdeps/unix/sysv/linux/getdents.c
@@ -76,7 +76,6 @@ struct kernel_dirent64
    reset the file descriptor.  In practice the kernel is limiting the
    amount of data returned much more then the reduced buffer size.  */
 __GETDENTS (int fd, char *buf, size_t nbytes)
   ssize_t retval;
diff --git a/sysdeps/unix/sysv/linux/i386/olddirent.h b/sysdeps/unix/sysv/linux/i386/olddirent.h
index 8f2fcb7a9c..0b4c81da0e 100644
--- a/sysdeps/unix/sysv/linux/i386/olddirent.h
+++ b/sysdeps/unix/sysv/linux/i386/olddirent.h
@@ -34,8 +34,7 @@ extern struct __old_dirent64 *__old_readdir64 (DIR *__dirp);
 libc_hidden_proto (__old_readdir64);
 extern int __old_readdir64_r (DIR *__dirp, struct __old_dirent64 *__entry,
 			  struct __old_dirent64 **__result);
-extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes)
-	internal_function;
+extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes);
 int __old_scandir64 (const char * __dir,
 		     struct __old_dirent64 *** __namelist,
 		     int (*__selector) (const struct __old_dirent64 *),

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]