aboutsummaryrefslogtreecommitdiff
path: root/dirent
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-07 23:57:22 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-07 23:57:22 -0500
commita784e502472fb3a1afa4d01a47c66b52d23e00f6 (patch)
tree5ebaa084119dcffe41671a62e2e799b172c57d24 /dirent
parent33808bf1164be2e7c8535bdd5ac398c75c33ed49 (diff)
downloadglibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.zip
glibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.tar.gz
glibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.tar.bz2
Remove pre-ISO C support
No more __const.
Diffstat (limited to 'dirent')
-rw-r--r--dirent/dirent.h76
1 files changed, 38 insertions, 38 deletions
diff --git a/dirent/dirent.h b/dirent/dirent.h
index 6a5a0ef..56d9701 100644
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2000,2003-2005,2009,2010,2011
+/* Copyright (C) 1991-2000,2003-2005,2009,2010,2011,2012
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -133,7 +133,7 @@ typedef struct __dirstream DIR;
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern DIR *opendir (__const char *__name) __nonnull ((1));
+extern DIR *opendir (const char *__name) __nonnull ((1));
#ifdef __USE_XOPEN2K8
/* Same as opendir, but open the stream on the file descriptor FD.
@@ -253,20 +253,20 @@ extern int dirfd (DIR *__dirp) __THROW __nonnull ((1));
This function is a cancellation point and therefore not marked with
__THROW. */
# ifndef __USE_FILE_OFFSET64
-extern int scandir (__const char *__restrict __dir,
+extern int scandir (const char *__restrict __dir,
struct dirent ***__restrict __namelist,
- int (*__selector) (__const struct dirent *),
- int (*__cmp) (__const struct dirent **,
- __const struct dirent **))
+ int (*__selector) (const struct dirent *),
+ int (*__cmp) (const struct dirent **,
+ const struct dirent **))
__nonnull ((1, 2));
# else
# ifdef __REDIRECT
extern int __REDIRECT (scandir,
- (__const char *__restrict __dir,
+ (const char *__restrict __dir,
struct dirent ***__restrict __namelist,
- int (*__selector) (__const struct dirent *),
- int (*__cmp) (__const struct dirent **,
- __const struct dirent **)),
+ int (*__selector) (const struct dirent *),
+ int (*__cmp) (const struct dirent **,
+ const struct dirent **)),
scandir64) __nonnull ((1, 2));
# else
# define scandir scandir64
@@ -276,11 +276,11 @@ extern int __REDIRECT (scandir,
# if defined __USE_GNU && defined __USE_LARGEFILE64
/* This function is like `scandir' but it uses the 64bit dirent structure.
Please note that the CMP function must now work with struct dirent64 **. */
-extern int scandir64 (__const char *__restrict __dir,
+extern int scandir64 (const char *__restrict __dir,
struct dirent64 ***__restrict __namelist,
- int (*__selector) (__const struct dirent64 *),
- int (*__cmp) (__const struct dirent64 **,
- __const struct dirent64 **))
+ int (*__selector) (const struct dirent64 *),
+ int (*__cmp) (const struct dirent64 **,
+ const struct dirent64 **))
__nonnull ((1, 2));
# endif
@@ -291,20 +291,20 @@ extern int scandir64 (__const char *__restrict __dir,
This function is a cancellation point and therefore not marked with
__THROW. */
# ifndef __USE_FILE_OFFSET64
-extern int scandirat (int __dfd, __const char *__restrict __dir,
+extern int scandirat (int __dfd, const char *__restrict __dir,
struct dirent ***__restrict __namelist,
- int (*__selector) (__const struct dirent *),
- int (*__cmp) (__const struct dirent **,
- __const struct dirent **))
+ int (*__selector) (const struct dirent *),
+ int (*__cmp) (const struct dirent **,
+ const struct dirent **))
__nonnull ((2, 3));
# else
# ifdef __REDIRECT
extern int __REDIRECT (scandirat,
- (int __dfd, __const char *__restrict __dir,
+ (int __dfd, const char *__restrict __dir,
struct dirent ***__restrict __namelist,
- int (*__selector) (__const struct dirent *),
- int (*__cmp) (__const struct dirent **,
- __const struct dirent **)),
+ int (*__selector) (const struct dirent *),
+ int (*__cmp) (const struct dirent **,
+ const struct dirent **)),
scandirat64) __nonnull ((2, 3));
# else
# define scandirat scandirat64
@@ -313,24 +313,24 @@ extern int __REDIRECT (scandirat,
/* This function is like `scandir' but it uses the 64bit dirent structure.
Please note that the CMP function must now work with struct dirent64 **. */
-extern int scandirat64 (int __dfd, __const char *__restrict __dir,
+extern int scandirat64 (int __dfd, const char *__restrict __dir,
struct dirent64 ***__restrict __namelist,
- int (*__selector) (__const struct dirent64 *),
- int (*__cmp) (__const struct dirent64 **,
- __const struct dirent64 **))
+ int (*__selector) (const struct dirent64 *),
+ int (*__cmp) (const struct dirent64 **,
+ const struct dirent64 **))
__nonnull ((2, 3));
# endif
/* Function to compare two `struct dirent's alphabetically. */
# ifndef __USE_FILE_OFFSET64
-extern int alphasort (__const struct dirent **__e1,
- __const struct dirent **__e2)
+extern int alphasort (const struct dirent **__e1,
+ const struct dirent **__e2)
__THROW __attribute_pure__ __nonnull ((1, 2));
# else
# ifdef __REDIRECT
extern int __REDIRECT_NTH (alphasort,
- (__const struct dirent **__e1,
- __const struct dirent **__e2),
+ (const struct dirent **__e1,
+ const struct dirent **__e2),
alphasort64) __attribute_pure__ __nonnull ((1, 2));
# else
# define alphasort alphasort64
@@ -338,8 +338,8 @@ extern int __REDIRECT_NTH (alphasort,
# endif
# if defined __USE_GNU && defined __USE_LARGEFILE64
-extern int alphasort64 (__const struct dirent64 **__e1,
- __const struct dirent64 **__e2)
+extern int alphasort64 (const struct dirent64 **__e1,
+ const struct dirent64 **__e2)
__THROW __attribute_pure__ __nonnull ((1, 2));
# endif
#endif /* Use BSD or misc or XPG7. */
@@ -378,14 +378,14 @@ extern __ssize_t getdirentries64 (int __fd, char *__restrict __buf,
#ifdef __USE_GNU
/* Function to compare two `struct dirent's by name & version. */
# ifndef __USE_FILE_OFFSET64
-extern int versionsort (__const struct dirent **__e1,
- __const struct dirent **__e2)
+extern int versionsort (const struct dirent **__e1,
+ const struct dirent **__e2)
__THROW __attribute_pure__ __nonnull ((1, 2));
# else
# ifdef __REDIRECT
extern int __REDIRECT_NTH (versionsort,
- (__const struct dirent **__e1,
- __const struct dirent **__e2),
+ (const struct dirent **__e1,
+ const struct dirent **__e2),
versionsort64)
__attribute_pure__ __nonnull ((1, 2));
# else
@@ -394,8 +394,8 @@ extern int __REDIRECT_NTH (versionsort,
# endif
# ifdef __USE_LARGEFILE64
-extern int versionsort64 (__const struct dirent64 **__e1,
- __const struct dirent64 **__e2)
+extern int versionsort64 (const struct dirent64 **__e1,
+ const struct dirent64 **__e2)
__THROW __attribute_pure__ __nonnull ((1, 2));
# endif
#endif /* Use GNU. */