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. --- string/string.h | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'string/string.h') diff --git a/string/string.h b/string/string.h index 5ded08f58b..201cff5f74 100644 --- a/string/string.h +++ b/string/string.h @@ -167,11 +167,13 @@ extern char *strtok __P ((char *__restrict __s, /* Divide S into tokens separated by characters in DELIM. Information passed between calls are stored in SAVE_PTR. */ -extern char *__strtok_r __P ((char *__s, __const char *__delim, - char **__save_ptr)); +extern char *__strtok_r __P ((char *__restrict __s, + __const char *__restrict __delim, + char **__restrict __save_ptr)); #if defined __USE_POSIX || defined __USE_MISC -extern char *strtok_r __P ((char *__s, __const char *__delim, - char **__save_ptr)); +extern char *strtok_r __P ((char *__restrict __s, + __const char *__restrict __delim, + char **__restrict __save_ptr)); #endif #ifdef __USE_GNU @@ -268,7 +270,8 @@ extern int __strncasecmp_l __P ((__const char *__s1, __const char *__s2, #ifdef __USE_BSD /* Return the next DELIM-delimited token from *STRINGP, terminating it with a '\0', and update *STRINGP to point past it. */ -extern char *strsep __P ((char **__stringp, __const char *__delim)); +extern char *strsep __P ((char **__restrict __stringp, + __const char *__restrict __delim)); #endif #ifdef __USE_GNU @@ -279,13 +282,17 @@ extern int strverscmp __P ((__const char *__s1, __const char *__s2)); extern char *strsignal __P ((int __sig)); /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */ -extern char *__stpcpy __P ((char *__dest, __const char *__src)); -extern char *stpcpy __P ((char *__dest, __const char *__src)); +extern char *__stpcpy __P ((char *__restrict __dest, + __const char *__restrict __src)); +extern char *stpcpy __P ((char *__restrict __dest, + __const char *__restrict __src)); /* Copy no more than N characters of SRC to DEST, returning the address of the last character written into DEST. */ -extern char *__stpncpy __P ((char *__dest, __const char *__src, size_t __n)); -extern char *stpncpy __P ((char *__dest, __const char *__src, size_t __n)); +extern char *__stpncpy __P ((char *__restrict __dest, + __const char *__restrict __src, size_t __n)); +extern char *stpncpy __P ((char *__restrict __dest, + __const char *__restrict __src, size_t __n)); /* Sautee STRING briskly. */ extern char *strfry __P ((char *__string)); -- cgit v1.2.3