diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2007-04-04 18:32:49 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2007-04-04 18:32:49 +0000 |
| commit | db7aa4b168ac43894f6ce58cf9b79b5be528e378 (patch) | |
| tree | dfcfcb8f9fe73b8cf5b80caff3773925daa13c23 /newlib/libc/stdio/fiprintf.c | |
| parent | 26631d2144fcc57286421c1bba8fde1935603dd1 (diff) | |
| download | newlib-db7aa4b168ac43894f6ce58cf9b79b5be528e378.zip newlib-db7aa4b168ac43894f6ce58cf9b79b5be528e378.tar.gz newlib-db7aa4b168ac43894f6ce58cf9b79b5be528e378.tar.bz2 | |
2007-04-04 Eric Blake <ebb9@byu.net>
* libc/stdio/asiprintf.c (_asiprintf_r): Fix reentrancy.
(asiprintf): Avoid overhead.
* libc/stdio/asprintf.c (_asprintf_r): Fix reentrancy.
(asprintf): Avoid overhead.
* libc/stdio/diprintf.c (_diprintf_r, diprintf): New file.
* libc/stdio/dprintf.c (_dprintf_r, dprintf): Use _DEFUN.
* libc/stdio/fiprintf.c (_fiprintf_r): Add reentrant version.
(fiprintf): Avoid overhead.
* libc/stdio/fprintf.c (_fprintf_r): Add reentrant version.
(fprintf): Avoid overhead.
* libc/stdio/iprintf.c (_iprintf_r): Use _DEFUN.
(iprintf): Avoid overhead.
* libc/stdio/printf.c (_printf_r): Use _DEFUN.
(printf): Avoid overhead.
* libc/stdio/vasiprintf.c (vasiprintf): Reduce binary size.
* libc/stdio/vasprintf.c (vasprintf): Reduce binary size.
* libc/stdio/vdiprintf.c (_vdiprintf_r, vdiprintf): New file.
* libc/stdio/vdprintf.c (vdprintf): Avoid overhead.
* libc/stdio/vsiprintf.c (vsiprintf): Reduce binary size.
* libc/stdio/vsniprintf.c (vsniprintf): Reduce binary size.
* libc/stdio/vsnprintf.c (vsnprintf): Reduce binary size.
* libc/stdio/vsprintf.c (vsprintf): Reduce binary size.
* libc/stdio/Makefile.am (GENERAL_SOURCES): Add diprintf.c,
vdiprintf.c.
* libc/include/stdio.h (diprintf, _diprintf_r, vdiprintf)
(_vdiprintf_r, _fiprintf_r, _vfiprintf_r): Add prototypes.
Diffstat (limited to 'newlib/libc/stdio/fiprintf.c')
| -rw-r--r-- | newlib/libc/stdio/fiprintf.c | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/newlib/libc/stdio/fiprintf.c b/newlib/libc/stdio/fiprintf.c index 3529e7f..0db5f1b 100644 --- a/newlib/libc/stdio/fiprintf.c +++ b/newlib/libc/stdio/fiprintf.c @@ -16,33 +16,39 @@ */ #include <_ansi.h> +#include <reent.h> #include <stdio.h> -#ifdef _HAVE_STDC #include <stdarg.h> -#else -#include <varargs.h> -#endif -#ifdef _HAVE_STDC int -fiprintf(FILE * fp, _CONST char *fmt,...) -#else +_DEFUN(_fiprintf_r, (ptr, fp, fmt), + struct _reent *ptr _AND + FILE * fp _AND + const char *fmt _DOTS) +{ + int ret; + va_list ap; + + va_start (ap, fmt); + ret = _vfiprintf_r (ptr, fp, fmt, ap); + va_end (ap); + return ret; +} + +#ifndef _REENT_ONLY + int -fiprintf(fp, fmt, va_alist) - FILE *fp; - char *fmt; - va_dcl -#endif +_DEFUN(fiprintf, (fp, fmt), + FILE * fp _AND + const char *fmt _DOTS) { int ret; va_list ap; -#ifdef _HAVE_STDC va_start (ap, fmt); -#else - va_start (ap); -#endif - ret = vfiprintf (fp, fmt, ap); + ret = _vfiprintf_r (_REENT, fp, fmt, ap); va_end (ap); return ret; } + +#endif /* ! _REENT_ONLY */ |