Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/include/stdio.h,v
rcsdiff: /ftp/cvs/cvsroot/src/include/stdio.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.38
retrieving revision 1.42.2.1
diff -u -p -r1.38 -r1.42.2.1
--- src/include/stdio.h	2000/07/28 09:38:15	1.38
+++ src/include/stdio.h	2002/05/24 22:05:51	1.42.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.38 2000/07/28 09:38:15 kleink Exp $	*/
+/*	$NetBSD: stdio.h,v 1.42.2.1 2002/05/24 22:05:51 perry Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -123,8 +123,10 @@ typedef	struct __sFILE {
 	fpos_t	(*_seek)  __P((void *, fpos_t, int));
 	int	(*_write) __P((void *, const char *, int));
 
+	/* file extension */
+	struct	__sbuf _ext;
+
 	/* separate buffer for long sequences of ungetc() */
-	struct	__sbuf _ub;	/* ungetc buffer */
 	unsigned char *_up;	/* saved _p when _p is doing ungetc data */
 	int	_ur;		/* saved _r when _r is counting ungetc data */
 
@@ -218,42 +220,45 @@ int	 feof __P((FILE *));
 int	 ferror __P((FILE *));
 int	 fflush __P((FILE *));
 int	 fgetc __P((FILE *));
-int	 fgetpos __P((FILE *, fpos_t *));
-char	*fgets __P((char *, int, FILE *));
+int	 fgetpos __P((FILE * __restrict, fpos_t * __restrict));
+char	*fgets __P((char * __restrict, int, FILE * __restrict));
 FILE	*fopen __P((const char *, const char *));
-int	 fprintf __P((FILE *, const char *, ...));
+int	 fprintf __P((FILE * __restrict , const char * __restrict, ...));
 int	 fputc __P((int, FILE *));
-int	 fputs __P((const char *, FILE *));
-size_t	 fread __P((void *, size_t, size_t, FILE *));
-FILE	*freopen __P((const char *, const char *, FILE *));
-int	 fscanf __P((FILE *, const char *, ...));
+int	 fputs __P((const char * __restrict, FILE * __restrict));
+size_t	 fread __P((void * __restrict, size_t, size_t, FILE * __restrict));
+FILE	*freopen __P((const char *, const char *, FILE * __restrict));
+int	 fscanf __P((FILE * __restrict, const char * __restrict, ...));
 int	 fseek __P((FILE *, long, int));
 int	 fsetpos __P((FILE *, const fpos_t *));
 long	 ftell __P((FILE *));
-size_t	 fwrite __P((const void *, size_t, size_t, FILE *));
+size_t	 fwrite __P((const void * __restrict, size_t, size_t,
+	    FILE * __restrict));
 int	 getc __P((FILE *));
 int	 getchar __P((void));
 void	 perror __P((const char *));
-int	 printf __P((const char *, ...));
+int	 printf __P((const char * __restrict, ...));
 int	 putc __P((int, FILE *));
 int	 putchar __P((int));
 int	 puts __P((const char *));
 int	 remove __P((const char *));
 void	 rewind __P((FILE *));
-int	 scanf __P((const char *, ...));
-void	 setbuf __P((FILE *, char *));
-int	 setvbuf __P((FILE *, char *, int, size_t));
-int	 sscanf __P((const char *, const char *, ...));
+int	 scanf __P((const char * __restrict, ...));
+void	 setbuf __P((FILE * __restrict, char * __restrict));
+int	 setvbuf __P((FILE * __restrict, char * __restrict, int, size_t));
+int	 sscanf __P((const char * __restrict, const char * __restrict, ...));
 FILE	*tmpfile __P((void));
 int	 ungetc __P((int, FILE *));
-int	 vfprintf __P((FILE *, const char *, _BSD_VA_LIST_));
-int	 vprintf __P((const char *, _BSD_VA_LIST_));
+int	 vfprintf __P((FILE * __restrict, const char * __restrict,
+	    _BSD_VA_LIST_));
+int	 vprintf __P((const char * __restrict, _BSD_VA_LIST_));
 
 #ifndef __AUDIT__
 char	*gets __P((char *));
-int	 sprintf __P((char *, const char *, ...));
+int	 sprintf __P((char * __restrict, const char * __restrict, ...));
 char	*tmpnam __P((char *));
-int	 vsprintf __P((char *, const char *, _BSD_VA_LIST_));
+int	 vsprintf __P((char * __resitrct, const char * __restrict,
+	    _BSD_VA_LIST_));
 #endif
 
 #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)
@@ -272,7 +277,11 @@ __END_DECLS
 
 __BEGIN_DECLS
 char	*ctermid __P((char *));
+#ifndef __CUSERID_DECLARED
+#define __CUSERID_DECLARED
+/* also declared in unistd.h */
 char	*cuserid __P((char *));
+#endif /* __CUSERID_DECLARED */
 FILE	*fdopen __P((int, const char *));
 int	 fileno __P((FILE *));
 __END_DECLS
@@ -317,9 +326,10 @@ __END_DECLS
 __BEGIN_DECLS
 int	 getw __P((FILE *));
 int	 putw __P((int, FILE *));
-int	 snprintf __P((char *, size_t, const char *, ...))
+int	 snprintf __P((char * __restrict, size_t, const char * __restrict, ...))
 	    __attribute__((__format__(__printf__, 3, 4)));
-int	 vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_))
+int	 vsnprintf __P((char * __restrict, size_t, const char * __restrict,
+	    _BSD_VA_LIST_))
 	    __attribute__((__format__(__printf__, 3, 0)));
 
 #ifndef __AUDIT__
@@ -350,18 +360,22 @@ __END_DECLS
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
     !defined(_XOPEN_SOURCE)
 __BEGIN_DECLS
-int	 asprintf __P((char **, const char *, ...))
-		__attribute__((__format__(__printf__, 2, 3)));
-char	*fgetln __P((FILE *, size_t *));
+int	 asprintf __P((char ** __restrict, const char * __restrict, ...))
+	    __attribute__((__format__(__printf__, 2, 3)));
+char	*fgetln __P((FILE * __restrict, size_t * __restrict));
 int	 fpurge __P((FILE *));
 void	 setbuffer __P((FILE *, char *, int));
 int	 setlinebuf __P((FILE *));
-int	 vasprintf __P((char **, const char *, _BSD_VA_LIST_))
-		__attribute__((__format__(__printf__, 2, 0)));
-int	 vscanf __P((const char *, _BSD_VA_LIST_))
+int	 vasprintf __P((char ** __restrict, const char * __restrict,
+	    _BSD_VA_LIST_))
+	    __attribute__((__format__(__printf__, 2, 0)));
+int	 vscanf __P((const char * __restrict, _BSD_VA_LIST_))
 	    __attribute__((__format__(__scanf__, 1, 0)));
-int	 vsscanf __P((const char *, const char *, _BSD_VA_LIST_))
+int	 vsscanf __P((const char * __restrict, const char * __restrict,
+	    _BSD_VA_LIST_))
 	    __attribute__((__format__(__scanf__, 2, 0)));
+__const char *fmtcheck __P((const char *, const char *))
+	    __attribute__((__format_arg__(2)));
 __END_DECLS
 
 /*
@@ -369,7 +383,7 @@ __END_DECLS
  * (unlike vfscanf) the name __svfscanf is guaranteed not to collide
  * with a user function when _ANSI_SOURCE or _POSIX_SOURCE is defined.
  */
-#define	 vfscanf	__svfscanf
+#define	 vfscanf(fp, fmt, va)	__svfscanf((fp), (fmt), (va))
 
 /*
  * Stdio function-access interface.
@@ -390,7 +404,9 @@ __END_DECLS
  */
 __BEGIN_DECLS
 int	__srget __P((FILE *));
-int	__svfscanf __P((FILE *, const char *, _BSD_VA_LIST_));
+int	__svfscanf __P((FILE * __restrict, const char * __restrict,
+	    _BSD_VA_LIST_))
+	    __attribute__((__format__(__scanf__, 2, 0)));
 int	__swbuf __P((int, FILE *));
 __END_DECLS