summaryrefslogtreecommitdiff
path: root/include/dirent.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-11-18 06:17:03 -0500
committerMike Frysinger <vapier@gentoo.org>2012-11-18 06:17:03 -0500
commit290e19f8147d9b3c0166d3520e718ae5603e4cef (patch)
tree3c77d58f8cd8115b861809560e644699341c14ee /include/dirent.h
parent266bdc1f623fe6fe489e5115e0f8ef723705d949 (diff)
drop support for pre ISO-C compilers
This drops __signed, __volatile, and __const. Only the latter was used in the code base, and for uClibc, not consistently. Much of the code used plain "const" which meant "__const" was useless. Really, the point of this is to stay in sync with what glibc did. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'include/dirent.h')
-rw-r--r--include/dirent.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/include/dirent.h b/include/dirent.h
index ff59b6b0a..00aa0773e 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -131,7 +131,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));
libc_hidden_proto(opendir)
#ifdef __USE_XOPEN2K8
@@ -255,20 +255,20 @@ libc_hidden_proto(dirfd)
sorted using qsort with CMP, and collected in a malloc'd array in
*NAMELIST. Returns the number of entries selected, or -1 on error. */
# 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
@@ -278,24 +278,24 @@ 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
/* 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
@@ -303,8 +303,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. */
@@ -343,14 +343,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
@@ -359,8 +359,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. */