From 05b315770a3925648b1a3b52781a75232809198d Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Fri, 23 Apr 2004 20:01:55 +0000 Subject: 2004-04-23 Artem B. Bityuckiy * 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. --- newlib/libc/stdio/tmpnam.c | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'newlib/libc/stdio/tmpnam.c') diff --git a/newlib/libc/stdio/tmpnam.c b/newlib/libc/stdio/tmpnam.c index ec346c878..ee722e630 100644 --- a/newlib/libc/stdio/tmpnam.c +++ b/newlib/libc/stdio/tmpnam.c @@ -2,7 +2,6 @@ * tmpname.c * Original Author: G. Haley */ - /* FUNCTION <>, <>---name for a temporary file @@ -20,8 +19,8 @@ ANSI_SYNOPSIS #include char *tmpnam(char *<[s]>); char *tempnam(char *<[dir]>, char *<[pfx]>); - char *_tmpnam_r(void *<[reent]>, char *<[s]>); - char *_tempnam_r(void *<[reent]>, char *<[dir]>, char *<[pfx]>); + char *_tmpnam_r(struct _reent *<[reent]>, char *<[s]>); + char *_tempnam_r(struct _reent *<[reent]>, char *<[dir]>, char *<[pfx]>); TRAD_SYNOPSIS #include @@ -33,11 +32,11 @@ TRAD_SYNOPSIS char *<[pfx]>; char *_tmpnam_r(<[reent]>, <[s]>) - char *<[reent]>; + struct _reent *<[reent]>; char *<[s]>; char *_tempnam_r(<[reent]>, <[dir]>, <[pfx]>) - char *<[reent]>; + struct *<[reent]>; char *<[dir]>; char *<[pfx]>; @@ -93,6 +92,7 @@ The global pointer <> is also required. */ #include <_ansi.h> +#include #include #include #include @@ -104,13 +104,13 @@ The global pointer <> is also required. another one. Return nonzero if successful, otherwise zero. */ static int -worker (ptr, result, part1, part2, part3, part4) - struct _reent *ptr; - char *result; - _CONST char *part1; - _CONST char *part2; - int part3; - int *part4; +_DEFUN(worker, (ptr, result, part1, part2, part3, part4), + struct _reent *ptr _AND + char *result _AND + _CONST char *part1 _AND + _CONST char *part2 _AND + int part3 _AND + int *part4) { /* Generate the filename and make sure that there isn't one called it already. */ @@ -136,9 +136,9 @@ worker (ptr, result, part1, part2, part3, part4) } char * -_DEFUN (_tmpnam_r, (p, s), - struct _reent *p _AND - char *s) +_DEFUN(_tmpnam_r, (p, s), + struct _reent *p _AND + char *s) { char *result; int pid; @@ -165,10 +165,10 @@ _DEFUN (_tmpnam_r, (p, s), } char * -_DEFUN (_tempnam_r, (p, dir, pfx), - struct _reent *p _AND - _CONST char *dir _AND - _CONST char *pfx) +_DEFUN(_tempnam_r, (p, dir, pfx), + struct _reent *p _AND + _CONST char *dir _AND + _CONST char *pfx) { char *filename; int length; @@ -192,16 +192,16 @@ _DEFUN (_tempnam_r, (p, dir, pfx), #ifndef _REENT_ONLY char * -_DEFUN (tempnam, (dir, pfx), - _CONST char *dir _AND - _CONST char *pfx) +_DEFUN(tempnam, (dir, pfx), + _CONST char *dir _AND + _CONST char *pfx) { return _tempnam_r (_REENT, dir, pfx); } char * -_DEFUN (tmpnam, (s), - char *s) +_DEFUN(tmpnam, (s), + char *s) { return _tmpnam_r (_REENT, s); } -- cgit v1.2.3