diff options
Diffstat (limited to 'newlib/libc/stdio/vsnprintf.c')
-rw-r--r-- | newlib/libc/stdio/vsnprintf.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/newlib/libc/stdio/vsnprintf.c b/newlib/libc/stdio/vsnprintf.c index 9fc1b2d89..4e9c283bb 100644 --- a/newlib/libc/stdio/vsnprintf.c +++ b/newlib/libc/stdio/vsnprintf.c @@ -1,3 +1,7 @@ +/* doc in vfprintf.c */ + +/* This code created by modifying vsprintf.c so copyright inherited. */ + /* * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -14,7 +18,6 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* doc in vfprintf.c */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "%W% (Berkeley) %G%"; @@ -30,14 +33,12 @@ static char sccsid[] = "%W% (Berkeley) %G%"; #include <varargs.h> #endif -#ifndef _REENT_ONLY - int -_DEFUN(vsnprintf, (str, size, fmt, ap), - char *str _AND - size_t size _AND - _CONST char *fmt _AND - va_list ap) +_DEFUN (vsnprintf, (str, size, fmt, ap), + char *str _AND + size_t size _AND + _CONST char *fmt _AND + va_list ap) { int ret; FILE f; @@ -45,22 +46,20 @@ _DEFUN(vsnprintf, (str, size, fmt, ap), f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = (size > 0 ? size - 1 : 0); - f._file = -1; /* No file. */ - ret = _vfprintf_r (_REENT, &f, fmt, ap); + f._data = _REENT; + ret = vfprintf (&f, fmt, ap); if (size > 0) *f._p = 0; return ret; } -#endif /* !_REENT_ONLY */ - int -_DEFUN(_vsnprintf_r, (ptr, str, size, fmt, ap), - struct _reent *ptr _AND - char *str _AND - size_t size _AND - _CONST char *fmt _AND - va_list ap) +_DEFUN (_vsnprintf_r, (ptr, str, size, fmt, ap), + struct _reent *ptr _AND + char *str _AND + size_t size _AND + _CONST char *fmt _AND + va_list ap) { int ret; FILE f; @@ -68,7 +67,7 @@ _DEFUN(_vsnprintf_r, (ptr, str, size, fmt, ap), f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = (size > 0 ? size - 1 : 0); - f._file = -1; /* No file. */ + f._data = ptr; ret = _vfprintf_r (ptr, &f, fmt, ap); if (size > 0) *f._p = 0; |