JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2001-04-24 Charles Wilson <cwilson@ece.gatech.edu

Browse Source 
* libc/stdio/vprintf.c (vprintf): fix signature to use _DEFUN
        * libc/stdio/vprintf.c (_vprintf_r): new function
        * libc/stdio/vsnprintf.c (vsnprintf): fix signature to use _DEFUN
        * libc/stdio/vsnprintf.c (_vsnprintf_r): fix signature to use
        _DEFUN, and call _vfprintf_r, not vfprintf.
        * libc/stdio/vsprintf.c (vsprintf.c): fix signature to use _DEFUN
        * libc/stdio/vsprintf.c (_vsprintf_r): fix signature to use
        _DEFUN, and call _vfprintf_r, not vfprintf.
This commit is contained in:
Jeff Johnston 2001-04-24 22:09:21 +00:00
parent b7cf6a2f5b
commit a874cd21de
4 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
newlib/ChangeLog
View File

@ -1,3 +1,14 @@
2001-04-24 Charles Wilson <cwilson@ece.gatech.edu
* libc/stdio/vprintf.c (vprintf): fix signature to use _DEFUN
* libc/stdio/vprintf.c (_vprintf_r): new function
* libc/stdio/vsnprintf.c (vsnprintf): fix signature to use _DEFUN
* libc/stdio/vsnprintf.c (_vsnprintf_r): fix signature to use
_DEFUN, and call _vfprintf_r, not vfprintf.
* libc/stdio/vsprintf.c (vsprintf.c): fix signature to use _DEFUN
* libc/stdio/vsprintf.c (_vsprintf_r): fix signature to use
_DEFUN, and call _vfprintf_r, not vfprintf.
2001-04-22 Earnie Boyd <earnie@users.sourceforge.net> 2001-04-22 Earnie Boyd <earnie@users.sourceforge.net>
* libc/include/sys/unistd.h [X_OK]: Use better protection against * libc/include/sys/unistd.h [X_OK]: Use better protection against

15
newlib/libc/stdio/vprintf.c
View File

@ -27,9 +27,18 @@
#endif #endif
int int
vprintf (fmt, ap) _DEFUN (vprintf, (fmt, ap),
char _CONST *fmt; _CONST char *fmt _AND
va_list ap; va_list ap)
{ {
return vfprintf (stdout, fmt, ap); return vfprintf (stdout, fmt, ap);
} }
int
_DEFUN (_vprintf_r, (ptr, fmt, ap),
struct _reent *ptr _AND
_CONST char *fmt _AND
va_list ap)
{
return _vfprintf_r (ptr, _stdout_r (ptr), fmt, ap);
}

24
newlib/libc/stdio/vsnprintf.c
View File

@ -34,11 +34,11 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#endif #endif
int int
vsnprintf (str, size, fmt, ap) _DEFUN (vsnprintf, (str, size, fmt, ap),
char *str; char *str _AND
size_t size; size_t size _AND
char _CONST *fmt; _CONST char *fmt _AND
va_list ap; va_list ap)
{ {
int ret; int ret;
FILE f; FILE f;
@ -54,12 +54,12 @@ vsnprintf (str, size, fmt, ap)
} }
int int
vsnprintf_r (ptr, str, size, fmt, ap) _DEFUN (_vsnprintf_r, (ptr, str, size, fmt, ap),
struct _reent *ptr; struct _reent *ptr _AND
char *str; char *str _AND
size_t size; size_t size _AND
char _CONST *fmt; _CONST char *fmt _AND
va_list ap; va_list ap)
{ {
int ret; int ret;
FILE f; FILE f;
@ -68,7 +68,7 @@ vsnprintf_r (ptr, str, size, fmt, ap)
f._bf._base = f._p = (unsigned char *) str; f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0); f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._data = ptr; f._data = ptr;
ret = vfprintf (&f, fmt, ap); ret = _vfprintf_r (ptr, &f, fmt, ap);
if (size > 0) if (size > 0)
*f._p = 0; *f._p = 0;
return ret; return ret;

20
newlib/libc/stdio/vsprintf.c
View File

@ -32,10 +32,10 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#endif #endif
int int
vsprintf (str, fmt, ap) _DEFUN (vsprintf, (str, fmt, ap),
char *str; char *str _AND
char _CONST *fmt; _CONST char *fmt _AND
va_list ap; va_list ap)
{ {
int ret; int ret;
FILE f; FILE f;
@ -50,11 +50,11 @@ vsprintf (str, fmt, ap)
} }
int int
vsprintf_r (ptr, str, fmt, ap) _DEFUN (_vsprintf_r, (ptr, str, fmt, ap),
struct _reent *ptr; struct _reent *ptr _AND
char *str; char *str _AND
char _CONST *fmt; _CONST char *fmt _AND
va_list ap; va_list ap)
{ {
int ret; int ret;
FILE f; FILE f;
@ -63,7 +63,7 @@ vsprintf_r (ptr, str, fmt, ap)
f._bf._base = f._p = (unsigned char *) str; f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = INT_MAX; f._bf._size = f._w = INT_MAX;
f._data = ptr; f._data = ptr;
ret = vfprintf (&f, fmt, ap); ret = _vfprintf_r (ptr, &f, fmt, ap);
*f._p = 0; *f._p = 0;
return ret; return ret;
} }