From a6ff34d7b0b59a1ad501dca25558ba21f6e539bb Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 4 Dec 1998 20:58:15 +0000 Subject: Update. 1998-12-04 Ulrich Drepper * argp/argp.h: Add __retrict. * dirent/dirent.h: Likewise. * elf/dlfcn.h: Likewise. * grp/grp.h: Likewise. * iconv/iconv.h: Likewise. * inet/aliases.h: Likewise. * libio/libio.h: Likewise. * libio/stdio.h: Likewise. * locale/locale.h: Likewise. * misc/mntent.h: Likewise. * posix/wordexp.h: Likewise. * pwd/pwd.h: Likewise. * resolv/netdb.h: Likewise. * rt/aio.h: Likewise. * stdio-common/printf.h: Likewise. * stdlib/monetary.h: Likewise. * stdlib/stdlib.h: Likewise. * string/argz.h: Likewise. * string/envz.h: Likewise. * string/string.h: Likewise. * time/time.h: Likewise. 1998-12-04 Zack Weinberg * misc/sys/cdefs.h: Only include features.h if _FEATURES_H isn't defined. gcc's redundant include optimizer isn't clever enough to prevent a reinclusion here. Define __restrict to the empty string only if not GCC or GCC version less than 2.92. 1998-12-03 Andreas Schwab * sysdeps/unix/sysv/linux/configure.in: Fix last change. 1998-12-03 Mark Kettenis * time/strptime.c (strptime_internal): Make use of `%C' format specifier if it is seen together with the `%y' specifier. 1998-12-04 Ulrich Drepper * po/sk.po: New file. 1998-12-03 Scott Bambrough * sysdeps/arm/dl-machine.h (dl_start_user): Incorrect address for _dl_main_searchlist passed to _dl_init_next. 1998-12-02 Andreas Schwab * math/libm-test.c: Expand literal tabs in strings. Normalize whitespace. 1998-12-02 Andreas Schwab * sysdeps/unix/sysv/linux/sys/fsuid.h: Fix spelling. --- dirent/dirent.h | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'dirent') diff --git a/dirent/dirent.h b/dirent/dirent.h index e286498..375d66e 100644 --- a/dirent/dirent.h +++ b/dirent/dirent.h @@ -143,12 +143,14 @@ extern struct dirent64 *readdir64 __P ((DIR *__dirp)); /* Reentrant version of `readdir'. Return in RESULT a pointer to the next entry. */ # ifndef __USE_FILE_OFFSET64 -extern int readdir_r __P ((DIR *__dirp, struct dirent *__entry, - struct dirent **__result)); +extern int readdir_r __P ((DIR *__restrict __dirp, + struct dirent *__restrict __entry, + struct dirent **__restrict __result)); # else # ifdef __REDIRECT -extern int __REDIRECT (readdir_r, __P ((DIR *__dirp, struct dirent *__entry, - struct dirent **__result)), +extern int __REDIRECT (readdir_r, __P ((DIR *__restrict __dirp, + struct dirent *__restrict __entry, + struct dirent **__restrict __result)), readdir64_r); # else # define readdir_r readdir64_r @@ -156,8 +158,9 @@ extern int __REDIRECT (readdir_r, __P ((DIR *__dirp, struct dirent *__entry, # endif # ifdef __USE_LARGEFILE64 -extern int readdir64_r __P ((DIR *__dirp, struct dirent64 *__entry, - struct dirent64 **__result)); +extern int readdir64_r __P ((DIR *__restrict __dirp, + struct dirent64 *__restrict __entry, + struct dirent64 **__restrict __result)); # endif #endif /* POSIX or misc */ @@ -203,14 +206,15 @@ extern int dirfd __P ((DIR *__dirp)); 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 __P ((__const char *__dir, struct dirent ***__namelist, +extern int scandir __P ((__const char *__restrict __dir, + struct dirent ***__restrict __namelist, int (*__selector) (__const struct dirent *), int (*__cmp) (__const __ptr_t, __const __ptr_t))); # else # ifdef __REDIRECT extern int __REDIRECT (scandir, - __P ((__const char *__dir, - struct dirent ***__namelist, + __P ((__const char *__restrict __dir, + struct dirent ***__restrict __namelist, int (*__selector) (__const struct dirent *), int (*__cmp) (__const __ptr_t, __const __ptr_t))), scandir64); @@ -222,7 +226,8 @@ 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 __P ((__const char *__dir, struct dirent64 ***__namelist, +extern int scandir64 __P ((__const char *__restrict __dir, + struct dirent64 ***__restrict __namelist, int (*__selector) (__const struct dirent64 *), int (*__cmp) (__const __ptr_t, __const __ptr_t))); # endif @@ -267,8 +272,9 @@ extern int versionsort64 __P ((__const __ptr_t __e1, __const __ptr_t __e2)); Reading starts at offset *BASEP, and *BASEP is updated with the new position after reading. Returns the number of bytes read; zero when at end of directory; or -1 for errors. */ -extern __ssize_t getdirentries __P ((int __fd, char *__buf, - size_t __nbytes, __off_t *__basep)); +extern __ssize_t getdirentries __P ((int __fd, char *__restrict __buf, + size_t __nbytes, + __off_t *__restrict __basep)); #endif /* Use BSD or misc. */ -- cgit v1.1