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, 35 insertions, 19 deletions

diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index 8c1555d34..f4fc551c4 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.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
 <<fdopen>>---turn open file into a stream
 
@@ -10,9 +27,9 @@ INDEX
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	FILE *fdopen(int <[fd]>, const char *<[mode]>);
-	FILE *_fdopen_r(void *<[reent]>,
-                     int <[fd]>, const char *<[mode]>);
-
+	FILE *_fdopen_r(struct _reent *<[reent]>,
+                        int <[fd]>, const char *<[mode]>);
+  
 TRAD_SYNOPSIS
 	#include <stdio.h>
 	FILE *fdopen(<[fd]>, <[mode]>)
@@ -20,7 +37,7 @@ TRAD_SYNOPSIS
 	char *<[mode]>;
 
 	FILE *_fdopen_r(<[reent]>, <[fd]>, <[mode]>)
-	char *<[reent]>;
+	struct _reent *<[reent]>;
         int <[fd]>;
 	char *<[mode]>);
 
@@ -37,21 +54,20 @@ PORTABILITY
 <<fdopen>> is ANSI.
 */
 
+#include <_ansi.h>
+#include <reent.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
-
 #include <stdio.h>
 #include <errno.h>
 #include "local.h"
 #include <_syslist.h>
 
-extern int __sflags ();
-
 FILE *
-_DEFUN (_fdopen_r, (ptr, fd, mode),
-	struct _reent *ptr _AND
-	int fd _AND
-	_CONST char *mode)
+_DEFUN(_fdopen_r, (ptr, fd, mode),
+       struct _reent *ptr _AND
+       int fd             _AND
+       _CONST char *mode)
 {
   register FILE *fp;
   int flags, oflags;
@@ -77,7 +93,7 @@ _DEFUN (_fdopen_r, (ptr, fd, mode),
   if ((fp = __sfp (ptr)) == 0)
     return 0;
 
-  _flockfile(fp);
+  _flockfile (fp);
 
   fp->_flags = flags;
   /*
@@ -107,23 +123,23 @@ _DEFUN (_fdopen_r, (ptr, fd, mode),
 #ifdef __SCLE
   /* Explicit given mode results in explicit setting mode on fd */
   if (oflags & O_BINARY)
-    setmode(fp->_file, O_BINARY);
+    setmode (fp->_file, O_BINARY);
   else if (oflags & O_TEXT)
-    setmode(fp->_file, O_TEXT);
-  if (__stextmode(fp->_file))
+    setmode (fp->_file, O_TEXT);
+  if (__stextmode (fp->_file))
     fp->_flags |= __SCLE;
 #endif
 
-  _funlockfile(fp);
+  _funlockfile (fp);
   return fp;
 }
 
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN (fdopen, (fd, mode),
-	int fd _AND
-	_CONST char *mode)
+_DEFUN(fdopen, (fd, mode),
+       int fd _AND
+       _CONST char *mode)
 {
   return _fdopen_r (_REENT, fd, mode);
 }