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, 24 insertions, 24 deletions

diff --git a/newlib/libc/stdio/mktemp.c b/newlib/libc/stdio/mktemp.c
index f5757f3c7..59e7a5c66 100644
--- a/newlib/libc/stdio/mktemp.c
+++ b/newlib/libc/stdio/mktemp.c
@@ -1,8 +1,3 @@
-/* This is file MKTEMP.C */
-/* This file may have been modified by DJ Delorie (Jan 1991).  If so,
-** these modifications are Copyright (C) 1991 DJ Delorie.
-*/
-
 /*
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
@@ -21,6 +16,10 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+/* This is file MKTEMP.C */
+/* This file may have been modified by DJ Delorie (Jan 1991).  If so,
+** these modifications are Copyright (C) 1991 DJ Delorie.
+*/
 
 /*
 FUNCTION
@@ -40,8 +39,8 @@ ANSI_SYNOPSIS
 	char *mktemp(char *<[path]>);
 	int mkstemp(char *<[path]>);
 
-	char *_mktemp_r(void *<[reent]>, char *<[path]>);
-	int *_mkstemp_r(void *<[reent]>, char *<[path]>);
+	char *_mktemp_r(struct _reent *<[reent]>, char *<[path]>);
+	int *_mkstemp_r(struct _reent *<[reent]>, char *<[path]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -52,11 +51,11 @@ TRAD_SYNOPSIS
 	char *<[path]>;
 
 	char *_mktemp_r(<[reent]>, <[path]>)
-	char *<[reent]>;
+	struct _reent *<[reent]>;
 	char *<[path]>;
 
 	int _mkstemp_r(<[reent]>, <[path]>)
-	char *<[reent]>;
+	struct _reent *<[reent]>;
 	char *<[path]>;
 
 DESCRIPTION
@@ -93,19 +92,20 @@ V Interface Definition requires <<mktemp>> as of Issue 2.
 Supporting OS subroutines required: <<getpid>>, <<open>>, <<stat>>.
 */
 
+#include <_ansi.h>
+#include <reent.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <reent.h>
 
 static int
-_DEFUN (_gettemp, (ptr, path, doopen),
-	struct _reent *ptr _AND
-	char *path _AND
-	register int *doopen)
+_DEFUN(_gettemp, (ptr, path, doopen),
+       struct _reent *ptr _AND
+       char *path         _AND
+       register int *doopen)
 {
   register char *start, *trv;
   struct stat sbuf;
@@ -190,9 +190,9 @@ _DEFUN (_gettemp, (ptr, path, doopen),
 }
 
 int
-_DEFUN (_mkstemp_r, (ptr, path),
-	struct _reent *ptr _AND
-	char *path)
+_DEFUN(_mkstemp_r, (ptr, path),
+       struct _reent *ptr _AND
+       char *path)
 {
   int fd;
 
@@ -200,9 +200,9 @@ _DEFUN (_mkstemp_r, (ptr, path),
 }
 
 char *
-_DEFUN (_mktemp_r, (ptr, path),
-	struct _reent *ptr _AND
-	char *path)
+_DEFUN(_mktemp_r, (ptr, path),
+       struct _reent *ptr _AND
+       char *path)
 {
   return (_gettemp (ptr, path, (int *) NULL) ? path : (char *) NULL);
 }
@@ -210,8 +210,8 @@ _DEFUN (_mktemp_r, (ptr, path),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN (mkstemp, (path),
-	char *path)
+_DEFUN(mkstemp, (path),
+       char *path)
 {
   int fd;
 
@@ -219,8 +219,8 @@ _DEFUN (mkstemp, (path),
 }
 
 char *
-_DEFUN (mktemp, (path),
-	char *path)
+_DEFUN(mktemp, (path),
+       char *path)
 {
   return (_gettemp (_REENT, path, (int *) NULL) ? path : (char *) NULL);
 }