diff options
author | robert <robert@FreeBSD.org> | 2002-08-15 09:47:10 +0000 |
---|---|---|
committer | robert <robert@FreeBSD.org> | 2002-08-15 09:47:10 +0000 |
commit | 4accb821f18b52fbbaf0d1e140d9ad40d85a1b97 (patch) | |
tree | 93309c791a798a5bcab0fbe9d6f7ff2aaf3301e6 | |
parent | 043ed1f5818681c934c1f781e5c12082c79b771c (diff) | |
download | FreeBSD-src-4accb821f18b52fbbaf0d1e140d9ad40d85a1b97.zip FreeBSD-src-4accb821f18b52fbbaf0d1e140d9ad40d85a1b97.tar.gz |
- Introduce the 'restrict' qualifier to function prototypes and
definitions to comply with IEEE Std 1003.1-2001.
- Update the manual pages.
-rw-r--r-- | include/stdio.h | 8 | ||||
-rw-r--r-- | lib/libc/stdio/fprintf.c | 2 | ||||
-rw-r--r-- | lib/libc/stdio/printf.3 | 8 | ||||
-rw-r--r-- | lib/libc/stdio/printf.c | 2 | ||||
-rw-r--r-- | lib/libc/stdio/snprintf.c | 2 | ||||
-rw-r--r-- | lib/libc/stdio/sprintf.c | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/include/stdio.h b/include/stdio.h index 4067b79..19f6208 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -221,7 +221,7 @@ int fgetc(FILE *); int fgetpos(FILE *, fpos_t *); char *fgets(char *, int, FILE *); FILE *fopen(const char *, const char *); -int fprintf(FILE *, const char *, ...); +int fprintf(FILE *__restrict, const char *__restrict, ...); int fputc(int, FILE *); int fputs(const char *, FILE *); size_t fread(void *, size_t, size_t, FILE *); @@ -235,7 +235,7 @@ int getc(FILE *); int getchar(void); char *gets(char *); void perror(const char *); -int printf(const char *, ...); +int printf(const char *__restrict, ...); int putc(int, FILE *); int putchar(int); int puts(const char *); @@ -245,7 +245,7 @@ void rewind(FILE *); int scanf(const char *, ...); void setbuf(FILE *__restrict, char *__restrict); int setvbuf(FILE *__restrict, char *__restrict, int, size_t); -int sprintf(char *, const char *, ...); +int sprintf(char *__restrict, const char *__restrict, ...); int sscanf(const char *, const char *, ...); FILE *tmpfile(void); char *tmpnam(char *); @@ -255,7 +255,7 @@ int vprintf(const char *, _BSD_VA_LIST_); int vsprintf(char *, const char *, _BSD_VA_LIST_); #if __ISO_C_VISIBLE >= 1999 -int snprintf(char *, size_t, const char *, ...) __printflike(3, 4); +int snprintf(char *__restrict, size_t, const char *__restrict, ...) __printflike(3, 4); int vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_) __printflike(3, 0); #endif diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c index 55ae1d5..4232cc7 100644 --- a/lib/libc/stdio/fprintf.c +++ b/lib/libc/stdio/fprintf.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <stdarg.h> int -fprintf(FILE *fp, const char *fmt, ...) +fprintf(FILE *__restrict fp, const char *__restrict fmt, ...) { int ret; va_list ap; diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3 index ca9aae2..9a285a4 100644 --- a/lib/libc/stdio/printf.3 +++ b/lib/libc/stdio/printf.3 @@ -48,13 +48,13 @@ .Sh SYNOPSIS .In stdio.h .Ft int -.Fn printf "const char *format" ... +.Fn printf "const char *restrict format" ... .Ft int -.Fn fprintf "FILE *stream" "const char *format" ... +.Fn fprintf "FILE *restrict stream" "const char *restrict format" ... .Ft int -.Fn sprintf "char *str" "const char *format" ... +.Fn sprintf "char *restrict str" "const char *restrict format" ... .Ft int -.Fn snprintf "char *str" "size_t size" "const char *format" ... +.Fn snprintf "char *restrict str" "size_t size" "const char *restrict format" ... .Ft int .Fn asprintf "char **ret" "const char *format" ... .In stdarg.h diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c index bd7d16c..1aa2767 100644 --- a/lib/libc/stdio/printf.c +++ b/lib/libc/stdio/printf.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <stdarg.h> int -printf(char const *fmt, ...) +printf(char const *__restrict fmt, ...) { int ret; va_list ap; diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c index e4cc7fc..c053ec9 100644 --- a/lib/libc/stdio/snprintf.c +++ b/lib/libc/stdio/snprintf.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" int -snprintf(char *str, size_t n, char const *fmt, ...) +snprintf(char *__restrict str, size_t n, char const *__restrict fmt, ...) { size_t on; int ret; diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c index e2511d6..71279ba 100644 --- a/lib/libc/stdio/sprintf.c +++ b/lib/libc/stdio/sprintf.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" int -sprintf(char *str, char const *fmt, ...) +sprintf(char *__restrict str, char const *__restrict fmt, ...) { int ret; va_list ap; |