2004-04-23 Artem B. Bityuckiy <abitytsky@softminecorp.com>

        * libc/stdio/asprintf.c libc/stdio/clearerr.c,
        libc/stdio/fclose.c libc/stdio/fcloseall.c libc/stdio/fdopen.c,
        libc/stdio/feof.c libc/stdio/ferror.c libc/stdio/fflush.c,
        libc/stdio/fgetc.c libc/stdio/fgetpos.c libc/stdio/fgets.c,
        libc/stdio/fileno.c libc/stdio/findfp.c libc/stdio/fiprintf.c,
        libc/stdio/flags.c libc/stdio/fopen.c libc/stdio/fprintf.c,
        libc/stdio/fputc.c libc/stdio/fputs.c libc/stdio/fread.c,
        libc/stdio/freopen.c libc/stdio/fscanf.c libc/stdio/fseek.c,
        libc/stdio/fseeko.c libc/stdio/fsetpos.c libc/stdio/ftell.c,
        libc/stdio/ftello.c libc/stdio/fvwrite.c libc/stdio/fwalk.c,
        libc/stdio/fwrite.c libc/stdio/getc.c libc/stdio/getc_u.c,
        libc/stdio/getchar.c libc/stdio/getchar_u.c,
        libc/stdio/getdelim.c libc/stdio/getline.c libc/stdio/gets.c,
        libc/stdio/getw.c libc/stdio/iprintf.c libc/stdio/local.h,
        libc/stdio/makebuf.c libc/stdio/mktemp.c libc/stdio/perror.c,
        libc/stdio/printf.c libc/stdio/putc.c libc/stdio/putc_u.c,
        libc/stdio/putchar.c libc/stdio/putchar_u.c libc/stdio/puts.c,
        libc/stdio/putw.c libc/stdio/refill.c libc/stdio/remove.c,
        libc/stdio/rename.c libc/stdio/rewind.c libc/stdio/rget.c,
        libc/stdio/scanf.c libc/stdio/setbuf.c libc/stdio/setbuffer.c,
        libc/stdio/setlinebuf.c libc/stdio/setvbuf.c,
        libc/stdio/siprintf.c libc/stdio/snprintf.c,
        libc/stdio/sprintf.c libc/stdio/sscanf.c libc/stdio/stdio.c,
        libc/stdio/tmpfile.c libc/stdio/tmpnam.c libc/stdio/ungetc.c,
        libc/stdio/vasprintf.c libc/stdio/vfieeefp.h,
        libc/stdio/vfprintf.c libc/stdio/vfscanf.c,
        libc/stdio/vprintf.c libc/stdio/vscanf.c,
        libc/stdio/vsnprintf.c libc/stdio/vsprintf.c,
        libc/stdio/vsscanf.c libc/stdio/wbuf.c,
        libc/stdio/wsetup.c: Perform minor formatting changes.  Move
        copyright notices to top of file, ensure that <_ansi.h> is
        included, be consistent with open parentheses, use _DEFUN macro,
        include "local.h" where needed, and remove various compiler
        warnings.

1 files changed, 24 insertions, 22 deletions

diff --git a/newlib/libc/stdio/stdio.c b/newlib/libc/stdio/stdio.c
index bf304bc..8bc7360 100644
--- a/newlib/libc/stdio/stdio.c
+++ b/newlib/libc/stdio/stdio.c
@@ -1,5 +1,3 @@
-/* No user fns here.  Pesch 15apr92. */
-
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -16,7 +14,10 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+/* No user fns here.  Pesch 15apr92. */
 
+#include <_ansi.h>
+#include <reent.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -29,10 +30,10 @@
  */
 
 _READ_WRITE_RETURN_TYPE
-__sread (cookie, buf, n)
-     _PTR cookie;
-     char *buf;
-     int n;
+_DEFUN(__sread, (cookie, buf, n),
+       _PTR cookie _AND
+       char *buf   _AND
+       int n)
 {
   register FILE *fp = (FILE *) cookie;
   register int ret;
@@ -40,14 +41,14 @@ __sread (cookie, buf, n)
 #ifdef __SCLE
   int oldmode = 0;
   if (fp->_flags & __SCLE)
-    oldmode = setmode(fp->_file, O_BINARY);
+    oldmode = setmode (fp->_file, O_BINARY);
 #endif
 
   ret = _read_r (_REENT, fp->_file, buf, n);
 
 #ifdef __SCLE
   if (oldmode)
-    setmode(fp->_file, oldmode);
+    setmode (fp->_file, oldmode);
 #endif
 
   /* If the read succeeded, update the current offset.  */
@@ -60,10 +61,10 @@ __sread (cookie, buf, n)
 }
 
 _READ_WRITE_RETURN_TYPE
-__swrite (cookie, buf, n)
-     _PTR cookie;
-     char _CONST *buf;
-     int n;
+_DEFUN(__swrite, (cookie, buf, n),
+       _PTR cookie      _AND
+       char _CONST *buf _AND
+       int n)
 {
   register FILE *fp = (FILE *) cookie;
   int w;
@@ -72,29 +73,29 @@ __swrite (cookie, buf, n)
 #endif
 
   if (fp->_flags & __SAPP)
-    (void) _lseek_r (_REENT, fp->_file, (_off_t) 0, SEEK_END);
+    _CAST_VOID _lseek_r (_REENT, fp->_file, (_off_t) 0, SEEK_END);
   fp->_flags &= ~__SOFF;	/* in case O_APPEND mode is set */
 
 #ifdef __SCLE
   if (fp->_flags & __SCLE)
-    oldmode = setmode(fp->_file, O_BINARY);
+    oldmode = setmode (fp->_file, O_BINARY);
 #endif
 
   w = _write_r (_REENT, fp->_file, buf, n);
 
 #ifdef __SCLE
   if (oldmode)
-    setmode(fp->_file, oldmode);
+    setmode (fp->_file, oldmode);
 #endif
 
   return w;
 }
 
 _fpos_t
-__sseek (cookie, offset, whence)
-     _PTR cookie;
-     _fpos_t offset;
-     int whence;
+_DEFUN(__sseek, (cookie, offset, whence),
+       _PTR cookie    _AND
+       _fpos_t offset _AND
+       int whence)
 {
   register FILE *fp = (FILE *) cookie;
   register _off_t ret;
@@ -111,8 +112,8 @@ __sseek (cookie, offset, whence)
 }
 
 int
-__sclose (cookie)
-     _PTR cookie;
+_DEFUN(__sclose, (cookie),
+       _PTR cookie)
 {
   FILE *fp = (FILE *) cookie;
 
@@ -121,7 +122,8 @@ __sclose (cookie)
 
 #ifdef __SCLE
 int
-__stextmode (int fd)
+_DEFUN(__stextmode, (fd), 
+       int fd)
 {
 #ifdef __CYGWIN__
   return _cygwin_istext_for_stdio (fd);