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, 22 insertions, 21 deletions

diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index faca53735..d8ceb8666 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -55,17 +55,18 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
+#include <_ansi.h>
 #include <stdio.h>
 #include <string.h>
 #include "local.h"
 
 #ifdef __SCLE
 static size_t
-_DEFUN (crlf, (fp, buf, count, eof),
-        FILE * fp _AND
-        char * buf _AND
-        size_t count _AND
-        int eof)
+_DEFUN(crlf, (fp, buf, count, eof),
+       FILE * fp _AND
+       char * buf _AND
+       size_t count _AND
+       int eof)
 {
   int newcount = 0, r;
   char *s, *d, *e;
@@ -84,11 +85,11 @@ _DEFUN (crlf, (fp, buf, count, eof),
     {
       if (*s == '\r')
         {
-          int c = __sgetc_raw(fp);
+          int c = __sgetc_raw (fp);
           if (c == '\n')
             *s = '\n';
           else
-            ungetc(c, fp);
+            ungetc (c, fp);
         }
       *d++ = *s++;
     }
@@ -96,7 +97,7 @@ _DEFUN (crlf, (fp, buf, count, eof),
 
   while (d < e)
     {
-      r = getc(fp);
+      r = getc (fp);
       if (r == EOF)
         return count - (e-d);
       *d++ = r;
@@ -109,11 +110,11 @@ _DEFUN (crlf, (fp, buf, count, eof),
 #endif
 
 size_t
-_DEFUN (fread, (buf, size, count, fp),
-	_PTR buf _AND
-	size_t size _AND
-	size_t count _AND
-	FILE * fp)
+_DEFUN(fread, (buf, size, count, fp),
+       _PTR buf _AND
+       size_t size _AND
+       size_t count _AND
+       FILE * fp)
 {
   register size_t resid;
   register char *p;
@@ -123,7 +124,7 @@ _DEFUN (fread, (buf, size, count, fp),
   if ((resid = count * size) == 0)
     return 0;
 
-  _flockfile(fp);
+  _flockfile (fp);
   if (fp->_r < 0)
     fp->_r = 0;
   total = resid;
@@ -131,7 +132,7 @@ _DEFUN (fread, (buf, size, count, fp),
 
   while (resid > (r = fp->_r))
     {
-      (void) memcpy ((void *) p, (void *) fp->_p, (size_t) r);
+      _CAST_VOID memcpy ((_PTR) p, (_PTR) fp->_p, (size_t) r);
       fp->_p += r;
       /* fp->_r = 0 ... done in __srefill */
       p += r;
@@ -142,24 +143,24 @@ _DEFUN (fread, (buf, size, count, fp),
 #ifdef __SCLE
           if (fp->_flags & __SCLE)
             {
-              _funlockfile(fp);
-              return crlf(fp, buf, total-resid, 1) / size;
+              _funlockfile (fp);
+              return crlf (fp, buf, total-resid, 1) / size;
             }
 #endif
-          _funlockfile(fp);
+          _funlockfile (fp);
 	  return (total - resid) / size;
 	}
     }
-  (void) memcpy ((void *) p, (void *) fp->_p, resid);
+  _CAST_VOID memcpy ((_PTR) p, (_PTR) fp->_p, resid);
   fp->_r -= resid;
   fp->_p += resid;
 #ifdef __SCLE
   if (fp->_flags & __SCLE)
     {
-      _funlockfile(fp);
+      _funlockfile (fp);
       return crlf(fp, buf, total, 0) / size;
     }
 #endif
-  _funlockfile(fp);
+  _funlockfile (fp);
   return count;
 }