From f77a1a884885a10a5210a42ad9bff6514eb0c374 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 30 Apr 2008 02:47:14 +0000 Subject: Fix 2008-04-14 regression in asprintf(ptr,""). * libc/stdio/asnprintf.c (asnprintf, _asnprintf_r): Avoid stdio baggage. * libc/stdio/asniprintf.c (asniprintf, _asniprintf_r): Likewise. * libc/stdio/asiprintf.c (asiprintf, _asiprintf_r): Likewise. * libc/stdio/vasniprintf.c (_vasniprintf_r): Likewise. * libc/stdio/vsnprintf.c (_vsnprintf_r): Likewise. * libc/stdio/vfprintf.c (_VFPRINTF_R) [STRING_ONLY]: Always malloc an initial buffer for asprintf. --- newlib/libc/stdio/asiprintf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'newlib/libc/stdio/asiprintf.c') diff --git a/newlib/libc/stdio/asiprintf.c b/newlib/libc/stdio/asiprintf.c index aab3b4410..97474fd1a 100644 --- a/newlib/libc/stdio/asiprintf.c +++ b/newlib/libc/stdio/asiprintf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1990, 2007 The Regents of the University of California. + * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -40,7 +40,7 @@ _DEFUN(_asiprintf_r, (ptr, strp, fmt), f._bf._size = f._w = 0; f._file = -1; /* No file. */ va_start (ap, fmt); - ret = _vfiprintf_r (ptr, &f, fmt, ap); + ret = _svfiprintf_r (ptr, &f, fmt, ap); va_end (ap); if (ret >= 0) { @@ -67,7 +67,7 @@ _DEFUN(asiprintf, (strp, fmt), f._bf._size = f._w = 0; f._file = -1; /* No file. */ va_start (ap, fmt); - ret = _vfiprintf_r (_REENT, &f, fmt, ap); + ret = _svfiprintf_r (_REENT, &f, fmt, ap); va_end (ap); if (ret >= 0) { -- cgit v1.2.3