--- Libc/Libc-583/stdio/FreeBSD/stdio.c
+++ Libc/Libc-1669.0.4/stdio/FreeBSD/stdio.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -38,7 +34,7 @@
 static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.24 2003/01/07 06:17:13 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.28 2008/05/05 16:14:02 jhb Exp $");
 
 #include "namespace.h"
 #include <errno.h>
@@ -54,10 +50,7 @@
  * Small standard I/O/seek/close functions.
  */
 int
-__sread(cookie, buf, n)
-	void *cookie;
-	char *buf;
-	int n;
+__sread(void *cookie, char *buf, int n)
 {
 	FILE *fp = cookie;
 
@@ -65,10 +58,7 @@
 }
 
 int
-__swrite(cookie, buf, n)
-	void *cookie;
-	char const *buf;
-	int n;
+__swrite(void *cookie, char const *buf, int n)
 {
 	FILE *fp = cookie;
 
@@ -76,10 +66,7 @@
 }
 
 fpos_t
-__sseek(cookie, offset, whence)
-	void *cookie;
-	fpos_t offset;
-	int whence;
+__sseek(void *cookie, fpos_t offset, int whence)
 {
 	FILE *fp = cookie;
 
@@ -87,8 +74,7 @@
 }
 
 int
-__sclose(cookie)
-	void *cookie;
+__sclose(void *cookie)
 {
 
 	return (_close(((FILE *)cookie)->_file));
@@ -98,10 +84,7 @@
  * Higher level wrappers.
  */
 int
-_sread(fp, buf, n)
-	FILE *fp;
-	char *buf;
-	int n;
+_sread(FILE *fp, char *buf, int n)
 {
 	int ret;
 
@@ -119,10 +102,7 @@
 }
 
 int
-_swrite(fp, buf, n)
-	FILE *fp;
-	char const *buf;
-	int n;
+_swrite(FILE *fp, char const *buf, int n)
 {
 	int ret;
 	int serrno;
@@ -149,10 +129,7 @@
 }
 
 fpos_t
-_sseek(fp, offset, whence)
-	FILE *fp;
-	fpos_t offset;
-	int whence;
+_sseek(FILE *fp, fpos_t offset, int whence)
 {
 	fpos_t ret;
 	int serrno, errret;