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, 20 insertions, 18 deletions

diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index b0372b57c..83128525a 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -66,37 +66,39 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<open>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
+#include <_ansi.h>
+#include <reent.h>
 #include <time.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include "local.h"
 #include <sys/lock.h>
+#include "local.h"
 
 /*
  * Re-direct an existing, open (probably) file to some other file.
  */
 
 FILE *
-_DEFUN (_freopen_r, (ptr, file, mode, fp),
-	struct _reent *ptr _AND
-	_CONST char *file _AND
-	_CONST char *mode _AND
-	register FILE *fp)
+_DEFUN(_freopen_r, (ptr, file, mode, fp),
+       struct _reent *ptr _AND
+       _CONST char *file _AND
+       _CONST char *mode _AND
+       register FILE *fp)
 {
   register int f;
   int flags, oflags, e;
 
   __sfp_lock_acquire ();
 
-  _flockfile(fp);
+  _flockfile (fp);
 
   CHECK_INIT (fp);
 
   if ((flags = __sflags (ptr, mode, &oflags)) == 0)
     {
-      _funlockfile(fp);
-      (void) _fclose_r (ptr, fp);
+      _funlockfile (fp);
+      _CAST_VOID _fclose_r (ptr, fp);
       __sfp_lock_release ();
       return NULL;
     }
@@ -114,10 +116,10 @@ _DEFUN (_freopen_r, (ptr, file, mode, fp),
   else
     {
       if (fp->_flags & __SWR)
-	(void) fflush (fp);
+	_CAST_VOID fflush (fp);
       /* if close is NULL, closing is a no-op, hence pointless */
       if (fp->_close != NULL)
-	(void) (*fp->_close) (fp->_cookie);
+	_CAST_VOID (*fp->_close) (fp->_cookie);
     }
 
   /*
@@ -153,7 +155,7 @@ _DEFUN (_freopen_r, (ptr, file, mode, fp),
     {				/* did not get it after all */
       fp->_flags = 0;		/* set it free */
       ptr->_errno = e;		/* restore in case _close clobbered */
-      _funlockfile(fp);
+      _funlockfile (fp);
 #ifndef __SINGLE_THREAD__
       __lock_close_recursive (*(_LOCK_RECURSIVE_T *)&fp->_lock);
 #endif
@@ -170,11 +172,11 @@ _DEFUN (_freopen_r, (ptr, file, mode, fp),
   fp->_close = __sclose;
 
 #ifdef __SCLE
-  if (__stextmode(fp->_file))
+  if (__stextmode (fp->_file))
     fp->_flags |= __SCLE;
 #endif
 
-  _funlockfile(fp);
+  _funlockfile (fp);
   __sfp_lock_release ();
   return fp;
 }
@@ -182,10 +184,10 @@ _DEFUN (_freopen_r, (ptr, file, mode, fp),
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN (freopen, (file, mode, fp),
-	_CONST char *file _AND
-	_CONST char *mode _AND
-	register FILE *fp)
+_DEFUN(freopen, (file, mode, fp),
+       _CONST char *file _AND
+       _CONST char *mode _AND
+       register FILE *fp)
 {
   return _freopen_r (_REENT, file, mode, fp);
 }