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/dprintf.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/dprintf.c')
| -rw-r--r-- | newlib/libc/stdio/dprintf.c | 63 |
1 files changed, 20 insertions, 43 deletions
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c index 6ebf12e..fd3c9b6 100644 --- a/newlib/libc/stdio/dprintf.c +++ b/newlib/libc/stdio/dprintf.c @@ -1,4 +1,4 @@ -/* Copyright 2005 Shaun Jackman +/* Copyright 2005, 2007 Shaun Jackman * Permission to use, copy, modify, and distribute this software * is freely granted, provided that this notice is preserved. */ @@ -17,9 +17,9 @@ ANSI_SYNOPSIS #include <stdarg.h> int dprintf(int <[fd]>, const char *<[format]>, ...); int vdprintf(int <[fd]>, const char *<[format]>, va_list <[ap]>); - int _dprintf_r(struct _reent *<[ptr]>, int <[fd]>, + int _dprintf_r(struct _reent *<[ptr]>, int <[fd]>, const char *<[format]>, ...); - int _vdprintf_r(struct _reent *<[ptr]>, int <[fd]>, + int _vdprintf_r(struct _reent *<[ptr]>, int <[fd]>, const char *<[format]>, va_list <[ap]>); TRAD_SYNOPSIS @@ -68,32 +68,18 @@ Supporting OS subroutines required: <<sbrk>>, <<write>>. #include <reent.h> #include <stdio.h> #include <unistd.h> -#ifdef _HAVE_STDC #include <stdarg.h> -#else -#include <varargs.h> -#endif -#ifdef _HAVE_STDC int -_dprintf_r(struct _reent *ptr, int fd, _CONST char *format, ...) -#else -int -_dprintf_r(ptr, fd, format, va_alist) - struct _reent *ptr; - int fd; - char *format; - va_dcl -#endif +_DEFUN(_dprintf_r, (ptr, fd, format), + struct _reent *ptr _AND + int fd _AND + const char *format _DOTS) { va_list ap; int n; _REENT_SMALL_CHECK_INIT (ptr); -#ifdef _HAVE_STDC - va_start (ap, format); -#else - va_start (ap); -#endif + va_start (ap, format); n = _vdprintf_r (ptr, fd, format, ap); va_end (ap); return n; @@ -101,29 +87,20 @@ _dprintf_r(ptr, fd, format, va_alist) #ifndef _REENT_ONLY -#ifdef _HAVE_STDC -int -dprintf(int fd, _CONST char *format, ...) -#else int -dprintf(fd, format, va_alist) - struct _reent *ptr; - int fd; - char *format; - va_dcl -#endif +_DEFUN(dprintf, (fd, format), + int fd _AND + const char *format _DOTS) { - va_list ap; - int n; - _REENT_SMALL_CHECK_INIT (_REENT); -#ifdef _HAVE_STDC - va_start (ap, format); -#else - va_start (ap); -#endif - n = _vdprintf_r (_REENT, fd, format, ap); - va_end (ap); - return n; + va_list ap; + int n; + struct _reent *ptr = _REENT; + + _REENT_SMALL_CHECK_INIT (ptr); + va_start (ap, format); + n = _vdprintf_r (ptr, fd, format, ap); + va_end (ap); + return n; } #endif /* ! _REENT_ONLY */ |