mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 11:00:04 +08:00
db7aa4b168
* 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.
80 lines
2.0 KiB
C
80 lines
2.0 KiB
C
/*
|
|
* Copyright (c) 1990, 2007 The Regents of the University of California.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that the above copyright notice and this paragraph are
|
|
* duplicated in all such forms and that any documentation,
|
|
* advertising materials, and other materials related to such
|
|
* distribution and use acknowledge that the software was developed
|
|
* by the University of California, Berkeley. The name of the
|
|
* University may not be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
/* This code was copied from asprintf.c */
|
|
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <limits.h>
|
|
#include "local.h"
|
|
|
|
int
|
|
_DEFUN(_asiprintf_r, (ptr, strp, fmt),
|
|
struct _reent *ptr _AND
|
|
char **strp _AND
|
|
const char *fmt _DOTS)
|
|
{
|
|
int ret;
|
|
va_list ap;
|
|
FILE f;
|
|
|
|
/* mark a zero-length reallocatable buffer */
|
|
f._flags = __SWR | __SSTR | __SMBF;
|
|
f._bf._base = f._p = NULL;
|
|
f._bf._size = f._w = 0;
|
|
f._file = -1; /* No file. */
|
|
va_start (ap, fmt);
|
|
ret = _vfiprintf_r (ptr, &f, fmt, ap);
|
|
va_end (ap);
|
|
if (ret >= 0)
|
|
{
|
|
*f._p = 0;
|
|
*strp = f._bf._base;
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
int
|
|
_DEFUN(asiprintf, (strp, fmt),
|
|
char **strp _AND
|
|
const char *fmt _DOTS)
|
|
{
|
|
int ret;
|
|
va_list ap;
|
|
FILE f;
|
|
|
|
/* mark a zero-length reallocatable buffer */
|
|
f._flags = __SWR | __SSTR | __SMBF;
|
|
f._bf._base = f._p = NULL;
|
|
f._bf._size = f._w = 0;
|
|
f._file = -1; /* No file. */
|
|
va_start (ap, fmt);
|
|
ret = _vfiprintf_r (_REENT, &f, fmt, ap);
|
|
va_end (ap);
|
|
if (ret >= 0)
|
|
{
|
|
*f._p = 0;
|
|
*strp = f._bf._base;
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
#endif /* ! _REENT_ONLY */
|