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

diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c
index de8e038fc..733a638e6 100644
--- a/newlib/libc/stdio/scanf.c
+++ b/newlib/libc/stdio/scanf.c
@@ -16,30 +16,30 @@
  */
 
 #include <_ansi.h>
+#include <reent.h>
 #include <stdio.h>
-#include "local.h"
-
 #ifdef _HAVE_STDC
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
+#include "local.h"
 
 #ifndef _REENT_ONLY
 
 int
 #ifdef _HAVE_STDC
-scanf (const char *fmt, ...)
+scanf(_CONST char *fmt, ...)
 #else
-scanf (fmt, va_alist)
-     char *fmt;
-     va_dcl
+scanf(fmt, va_alist)
+      char *fmt;
+      va_dcl
 #endif
 {
   int ret;
   va_list ap;
 
-  _REENT_SMALL_CHECK_INIT(_stdin_r (_REENT));
+  _REENT_SMALL_CHECK_INIT (_stdin_r (_REENT));
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
@@ -54,18 +54,18 @@ scanf (fmt, va_alist)
 
 int
 #ifdef _HAVE_STDC
-_scanf_r (struct _reent *ptr, const char *fmt, ...)
+_scanf_r(struct _reent *ptr, _CONST char *fmt, ...)
 #else
-_scanf_r (ptr, fmt, va_alist)
-     struct _reent *ptr;
-     char *fmt;
-     va_dcl
+_scanf_r(ptr, fmt, va_alist)
+         struct _reent *ptr;
+         char *fmt;
+         va_dcl
 #endif
 {
   int ret;
   va_list ap;
 
-  _REENT_SMALL_CHECK_INIT(_stdin_r (ptr));
+  _REENT_SMALL_CHECK_INIT (_stdin_r (ptr));
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
@@ -76,4 +76,3 @@ _scanf_r (ptr, fmt, va_alist)
   return (ret);
 }
 
-