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, 14 insertions, 13 deletions

diff --git a/newlib/libc/stdio/ungetc.c b/newlib/libc/stdio/ungetc.c
index 5ca98251d..4380cc2da 100644
--- a/newlib/libc/stdio/ungetc.c
+++ b/newlib/libc/stdio/ungetc.c
@@ -19,6 +19,7 @@
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
+#include <_ansi.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -33,8 +34,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 /*static*/
 int
-__submore (fp)
-     register FILE *fp;
+_DEFUN(__submore, (fp),
+       register FILE *fp)
 {
   register int i;
   register unsigned char *p;
@@ -58,7 +59,7 @@ __submore (fp)
   p = (unsigned char *) _realloc_r (_REENT, (_PTR) (fp->_ub._base), i << 1);
   if (p == NULL)
     return EOF;
-  (void) memcpy ((void *) (p + i), (void *) p, (size_t) i);
+  _CAST_VOID memcpy ((_PTR) (p + i), (_PTR) p, (size_t) i);
   fp->_p = p + i;
   fp->_ub._base = p;
   fp->_ub._size = i << 1;
@@ -66,14 +67,14 @@ __submore (fp)
 }
 
 int
-ungetc (c, fp)
-     int c;
-     register FILE *fp;
+_DEFUN(ungetc, (c, fp),
+       int c _AND
+       register FILE *fp)
 {
   if (c == EOF)
     return (EOF);
 
-  _flockfile(fp);
+  _flockfile (fp);
   
   /* Ensure stdio has been initialized.
      ??? Might be able to remove this as some other stdio routine should
@@ -92,14 +93,14 @@ ungetc (c, fp)
        */
       if ((fp->_flags & __SRW) == 0)
         {
-          _funlockfile(fp);
+          _funlockfile (fp);
           return EOF;
         }
       if (fp->_flags & __SWR)
 	{
 	  if (fflush (fp))
             {
-              _funlockfile(fp);
+              _funlockfile (fp);
               return EOF;
             }
 	  fp->_flags &= ~__SWR;
@@ -119,12 +120,12 @@ ungetc (c, fp)
     {
       if (fp->_r >= fp->_ub._size && __submore (fp))
         {
-          _funlockfile(fp);
+          _funlockfile (fp);
           return EOF;
         }
       *--fp->_p = c;
       fp->_r++;
-      _funlockfile(fp);
+      _funlockfile (fp);
       return c;
     }
 
@@ -138,7 +139,7 @@ ungetc (c, fp)
     {
       fp->_p--;
       fp->_r++;
-      _funlockfile(fp);
+      _funlockfile (fp);
       return c;
     }
 
@@ -154,6 +155,6 @@ ungetc (c, fp)
   fp->_ubuf[sizeof (fp->_ubuf) - 1] = c;
   fp->_p = &fp->_ubuf[sizeof (fp->_ubuf) - 1];
   fp->_r = 1;
-  _funlockfile(fp);
+  _funlockfile (fp);
   return c;
 }