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

diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c
index 4747e2156..b3df7f04e 100644
--- a/newlib/libc/stdio/fseek.c
+++ b/newlib/libc/stdio/fseek.c
@@ -98,6 +98,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
+#include <_ansi.h>
+#include <reent.h>
 #include <stdio.h>
 #include <time.h>
 #include <fcntl.h>
@@ -114,19 +116,20 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 
 int
-_DEFUN (_fseek_r, (ptr, fp, offset, whence),
-     struct _reent *ptr _AND
-     register FILE *fp _AND
-     long offset _AND
-     int whence)
+_DEFUN(_fseek_r, (ptr, fp, offset, whence),
+       struct _reent *ptr _AND
+       register FILE *fp  _AND
+       long offset        _AND
+       int whence)
 {
-  _fpos_t _EXFUN ((*seekfn), (void *, _fpos_t, int));
-  _fpos_t target, curoff;
+  _fpos_t _EXFUN((*seekfn), (_PTR, _fpos_t, int));
+  _fpos_t target;
+  _fpos_t curoff = 0;
   size_t n;
   struct stat st;
   int havepos;
 
-  _flockfile(fp);
+  _flockfile (fp);
 
   /* Make sure stdio is set up.  */
 
@@ -146,7 +149,7 @@ _DEFUN (_fseek_r, (ptr, fp, offset, whence),
   if ((seekfn = fp->_seek) == NULL)
     {
       ptr->_errno = ESPIPE;	/* ??? */
-      _funlockfile(fp);
+      _funlockfile (fp);
       return EOF;
     }
 
@@ -163,7 +166,7 @@ _DEFUN (_fseek_r, (ptr, fp, offset, whence),
        * we have to first find the current stream offset a la
        * ftell (see ftell for details).
        */
-      fflush(fp);   /* may adjust seek offset on append stream */
+      fflush (fp);   /* may adjust seek offset on append stream */
       if (fp->_flags & __SOFF)
 	curoff = fp->_offset;
       else
@@ -171,7 +174,7 @@ _DEFUN (_fseek_r, (ptr, fp, offset, whence),
 	  curoff = (*seekfn) (fp->_cookie, (_fpos_t) 0, SEEK_CUR);
 	  if (curoff == -1L)
 	    {
-	      _funlockfile(fp);
+	      _funlockfile (fp);
 	      return EOF;
 	    }
 	}
@@ -196,7 +199,7 @@ _DEFUN (_fseek_r, (ptr, fp, offset, whence),
 
     default:
       ptr->_errno = EINVAL;
-      _funlockfile(fp);
+      _funlockfile (fp);
       return (EOF);
     }
 
@@ -306,7 +309,7 @@ _DEFUN (_fseek_r, (ptr, fp, offset, whence),
       if (HASUB (fp))
 	FREEUB (fp);
       fp->_flags &= ~__SEOF;
-      _funlockfile(fp);
+      _funlockfile (fp);
       return 0;
     }
 
@@ -335,7 +338,7 @@ _DEFUN (_fseek_r, (ptr, fp, offset, whence),
       fp->_p += n;
       fp->_r -= n;
     }
-  _funlockfile(fp);
+  _funlockfile (fp);
   return 0;
 
   /*
@@ -346,7 +349,7 @@ _DEFUN (_fseek_r, (ptr, fp, offset, whence),
 dumb:
   if (fflush (fp) || (*seekfn) (fp->_cookie, offset, whence) == POS_ERR)
     {
-      _funlockfile(fp);
+      _funlockfile (fp);
       return EOF;
     }
   /* success: clear EOF indicator and discard ungetc() data */
@@ -356,17 +359,17 @@ dumb:
   fp->_r = 0;
   /* fp->_w = 0; *//* unnecessary (I think...) */
   fp->_flags &= ~__SEOF;
-  _funlockfile(fp);
+  _funlockfile (fp);
   return 0;
 }
 
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (fseek, (fp, offset, whence),
-     register FILE *fp _AND
-     long offset _AND
-     int whence)
+_DEFUN(fseek, (fp, offset, whence),
+       register FILE *fp _AND
+       long offset       _AND
+       int whence)
 {
   return _fseek_r (_REENT, fp, offset, whence);
 }