diff options
author | robert <robert@FreeBSD.org> | 2002-08-14 23:45:42 +0000 |
---|---|---|
committer | robert <robert@FreeBSD.org> | 2002-08-14 23:45:42 +0000 |
commit | 4b64f84a432f94425359802d506816872f43c5d7 (patch) | |
tree | 4a5ee2a856f08d941a04f571a20db00d3d4f6f88 | |
parent | f0abd50e99b630b7ce1849ce6d024d7ea4b3bc98 (diff) | |
download | FreeBSD-src-4b64f84a432f94425359802d506816872f43c5d7.zip FreeBSD-src-4b64f84a432f94425359802d506816872f43c5d7.tar.gz |
- Add the 'restrict' qualifier to the function definitions and
public prototypes of setbuf(3) and setvbuf(3) using the
'__restrict' macro from <sys/cdefs.h> to be compliant with
IEEE Std 1003.1-2001.
- Replace the K&R with ANSI-C function definitions.
- Bring the manual page up-to-date.
-rw-r--r-- | include/stdio.h | 4 | ||||
-rw-r--r-- | lib/libc/stdio/setbuf.3 | 4 | ||||
-rw-r--r-- | lib/libc/stdio/setbuf.c | 4 | ||||
-rw-r--r-- | lib/libc/stdio/setvbuf.c | 6 |
4 files changed, 6 insertions, 12 deletions
diff --git a/include/stdio.h b/include/stdio.h index 0d241fa..4067b79 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -243,8 +243,8 @@ int remove(const char *); int rename(const char *, const char *); void rewind(FILE *); int scanf(const char *, ...); -void setbuf(FILE *, char *); -int setvbuf(FILE *, char *, int, size_t); +void setbuf(FILE *__restrict, char *__restrict); +int setvbuf(FILE *__restrict, char *__restrict, int, size_t); int sprintf(char *, const char *, ...); int sscanf(const char *, const char *, ...); FILE *tmpfile(void); diff --git a/lib/libc/stdio/setbuf.3 b/lib/libc/stdio/setbuf.3 index d25f1b8..bfe6487 100644 --- a/lib/libc/stdio/setbuf.3 +++ b/lib/libc/stdio/setbuf.3 @@ -50,13 +50,13 @@ .Sh SYNOPSIS .In stdio.h .Ft void -.Fn setbuf "FILE *stream" "char *buf" +.Fn setbuf "FILE *restrict stream" "char *restrict buf" .Ft void .Fn setbuffer "FILE *stream" "char *buf" "int size" .Ft int .Fn setlinebuf "FILE *stream" .Ft int -.Fn setvbuf "FILE *stream" "char *buf" "int mode" "size_t size" +.Fn setvbuf "FILE *restrict stream" "char *restrict buf" "int mode" "size_t size" .Sh DESCRIPTION The three types of buffering available are unbuffered, block buffered, and line buffered. diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c index e6209fd..a1edef4 100644 --- a/lib/libc/stdio/setbuf.c +++ b/lib/libc/stdio/setbuf.c @@ -44,9 +44,7 @@ __FBSDID("$FreeBSD$"); #include "local.h" void -setbuf(fp, buf) - FILE *fp; - char *buf; +setbuf(FILE *__restrict fp, char *__restrict buf) { (void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ); } diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c index df88d24..8be8ff6 100644 --- a/lib/libc/stdio/setvbuf.c +++ b/lib/libc/stdio/setvbuf.c @@ -52,11 +52,7 @@ __FBSDID("$FreeBSD$"); * a buffer. */ int -setvbuf(fp, buf, mode, size) - FILE *fp; - char *buf; - int mode; - size_t size; +setvbuf(FILE *__restrict fp, char *__restrict buf, int mode, size_t size) { int ret, flags; size_t iosize; |