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.4
retrieving revision 1.10
diff -u -p -r1.4 -r1.10
--- src/include/stdio.h	1993/10/04 04:49:17	1.4
+++ src/include/stdio.h	1994/01/04 05:14:14	1.10
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)stdio.h	5.17 (Berkeley) 6/3/91
- *	$Id: stdio.h,v 1.4 1993/10/04 04:49:17 cgd Exp $
+ *	$Id: stdio.h,v 1.10 1994/01/04 05:14:14 cgd Exp $
  */
 
 #ifndef	_STDIO_H_
@@ -117,8 +117,8 @@ typedef	struct __sFILE {
 	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
 	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
 
-	/* separate buffer for fgetline() when line crosses buffer boundary */
-	struct	__sbuf _lb;	/* buffer for fgetline() */
+	/* separate buffer for fgetln() when line crosses buffer boundary */
+	struct	__sbuf _lb;	/* buffer for fgetln() */
 
 	/* Unix stdio files get aligned to block boundaries on fseek() */
 	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
@@ -143,7 +143,7 @@ __END_DECLS
 #define	__SOPT	0x0400		/* do fseek() optimisation */
 #define	__SNPT	0x0800		/* do not do fseek() optimisation */
 #define	__SOFF	0x1000		/* set iff _offset is in fact correct */
-#define	__SMOD	0x2000		/* true => fgetline modified _p text */
+#define	__SMOD	0x2000		/* true => fgetln modified _p text */
 
 /*
  * The following three definitions are for ANSI C, which took them
@@ -206,19 +206,19 @@ FILE	*fopen __P((const char *, const cha
 int	 fprintf __P((FILE *, const char *, ...));
 int	 fputc __P((int, FILE *));
 int	 fputs __P((const char *, FILE *));
-int	 fread __P((void *, size_t, size_t, 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	 fseek __P((FILE *, long, int));
 int	 fsetpos __P((FILE *, const fpos_t *));
 long	 ftell __P((const FILE *));
-int	 fwrite __P((const void *, size_t, size_t, FILE *));
+size_t	 fwrite __P((const void *, size_t, size_t, FILE *));
 int	 getc __P((FILE *));
 int	 getchar __P((void));
 char	*gets __P((char *));
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 extern int sys_nerr;			/* perror(3) external variables */
-extern char *sys_errlist[];
+extern const char *const sys_errlist[];
 #endif
 void	 perror __P((const char *));
 int	 printf __P((const char *, ...));
@@ -245,11 +245,12 @@ __END_DECLS
  * Functions defined in POSIX 1003.1.
  */
 #ifndef _ANSI_SOURCE
-#define	L_cuserid	9	/* size for cuserid(); UT_NAMESIZE + 1 */
 #define	L_ctermid	1024	/* size for ctermid(); PATH_MAX */
+#define L_cuserid	9	/* size for cuserid(); UT_NAMESIZE + 1 */
 
 __BEGIN_DECLS
 char	*ctermid __P((char *));
+char	*cuserid __P((char *));
 FILE	*fdopen __P((int, const char *));
 int	 fileno __P((FILE *));
 __END_DECLS
@@ -260,7 +261,7 @@ __END_DECLS
  */
 #if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 __BEGIN_DECLS
-char	*fgetline __P((FILE *, size_t *));
+char	*fgetln __P((FILE *, size_t *));
 int	 fpurge __P((FILE *));
 int	 getw __P((FILE *));
 int	 pclose __P((FILE *));
@@ -269,10 +270,14 @@ int	 putw __P((int, FILE *));
 void	 setbuffer __P((FILE *, char *, int));
 int	 setlinebuf __P((FILE *));
 char	*tempnam __P((const char *, const char *));
-int	 snprintf __P((char *, size_t, const char *, ...));
-int	 vsnprintf __P((char *, size_t, const char *, _VA_LIST_));
-int	 vscanf __P((const char *, _VA_LIST_));
-int	 vsscanf __P((const char *, const char *, _VA_LIST_));
+int	 snprintf __P((char *, size_t, const char *, ...))
+		__attribute__((format (printf, 3, 4)));
+int	 vsnprintf __P((char *, size_t, const char *, _VA_LIST_))
+		__attribute__((format (printf, 3, 0)));
+int	 vscanf __P((const char *, _VA_LIST_))
+		__attribute__((format (scanf, 1, 0)));
+int	 vsscanf __P((const char *, const char *, _VA_LIST_))
+		__attribute__((format (scanf, 2, 0)));
 __END_DECLS
 
 /*