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, 29 insertions, 32 deletions

diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c
index 0f92e0777..2f2ae47fa 100644
--- a/newlib/libc/stdio/fclose.c
+++ b/newlib/libc/stdio/fclose.c
@@ -1,4 +1,21 @@
 /*
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/*
 FUNCTION
 <<fclose>>---close a file
 
@@ -10,7 +27,7 @@ INDEX
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	int fclose(FILE *<[fp]>);
-	int _fclose_r(void *<[reent]>, FILE *<[fp]>);
+	int _fclose_r(struct _reent *<[reent]>, FILE *<[fp]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -18,7 +35,7 @@ TRAD_SYNOPSIS
 	FILE *<[fp]>;
         
 	int fclose(<[fp]>)
-        void *<[reent]>
+        struct _reent *<[reent]>
 	FILE *<[fp]>;
 
 DESCRIPTION
@@ -40,37 +57,17 @@ Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>,
 <<read>>, <<sbrk>>, <<write>>.
 */
 
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
+#include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "local.h"
 #include <sys/lock.h>
-
-/*
- * Close a file.
- */
+#include "local.h"
 
 int
-_DEFUN (_fclose_r, (rptr, fp),
-       struct _reent *rptr _AND
-       register FILE * fp)
+_DEFUN(_fclose_r, (rptr, fp),
+      struct _reent *rptr _AND
+      register FILE * fp)
 {
   int r;
 
@@ -79,13 +76,13 @@ _DEFUN (_fclose_r, (rptr, fp),
 
   __sfp_lock_acquire ();
 
-  _flockfile(fp);
+  _flockfile (fp);
   
   CHECK_INIT (fp);
 
   if (fp->_flags == 0)		/* not open! */
     {
-      _funlockfile(fp);
+      _funlockfile (fp);
       __sfp_lock_release ();
       return (0);
     }
@@ -99,7 +96,7 @@ _DEFUN (_fclose_r, (rptr, fp),
   if (HASLB (fp))
     FREELB (fp);
   fp->_flags = 0;		/* release this FILE for reuse */
-  _funlockfile(fp);
+  _funlockfile (fp);
 #ifndef __SINGLE_THREAD__
   __lock_close_recursive (*(_LOCK_RECURSIVE_T *)&fp->_lock);
 #endif
@@ -112,8 +109,8 @@ _DEFUN (_fclose_r, (rptr, fp),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (fclose, (fp),
-	register FILE * fp)
+_DEFUN(fclose, (fp),
+       register FILE * fp)
 {
   return _fclose_r(_REENT, fp);
 }