diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-03-06 09:55:52 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-03-06 09:55:52 +0000 |
| commit | 6121968b198dcbb93427b0a11453563ebe462bb4 (patch) | |
| tree | 1b612b73db2b4572c591bf8644021b2407a8f602 /newlib/libc/stdio/vswprintf.c | |
| parent | 6e0e5a4fc20a1de8124c454a5c14c616c68e4653 (diff) | |
| download | newlib-6121968b198dcbb93427b0a11453563ebe462bb4.zip newlib-6121968b198dcbb93427b0a11453563ebe462bb4.tar.gz newlib-6121968b198dcbb93427b0a11453563ebe462bb4.tar.bz2 | |
* libc/include/stdio.h (__VALIST): Guard against multiple definition.
* libc/include/wchar.h: Include stdarg.h.
(__VALIST): Define conditionally.
(fwprintf, swprintf, vfwprintf, vswprintf, vwprintf, wprintf: Declare.
(_fwprintf_r, _swprintf_r, _vfwprintf_r, _vswprintf_r, _vwprintf_r,
_wprintf_r): Declare.
* libc/stdio/Makefile.am: Add new files.
* libc/stdio/Makefile.in: Regenerate.
* libc/stdio/fwprintf.c: New file.
* libc/stdio/local.h (_svfwprintf_r, _svfiwprintf_r): Declare.
(__CH_CLASS, __STATE, __ACTION): Move definition from vfprintf.c here
and move to the __ namespace.
(__chclass, __state_table, __action_table): Declare.
* libc/stdio/stdio.tex: Add new documentation references.
* libc/stdio/swprintf.c: New file.
* libc/stdio/vfprintf.c (__SPRINT): New macro to call the right
__sprint_r function according to compilation unit. Use throughout.
(__ssprint_r): Rename STRING_ONLY variant from __sprint_r.
Make externaly available. Only define if INTEGER_ONLY is defined.
(__sprint_r): Make externaly available. Only define if INTEGER_ONLY
is defined. Handle stream orientation.
(__sbprintf): Copy FILE's _flags2 member as well.
(__chclass, __state_table, __action_table): Prepend __ to name and
make externally available.
* libc/stdio/vfwprintf.c: New file.
* libc/stdio/vswprintf.c: New file.
* libc/stdio/vwprintf.c: New file.
* libc/stdio/wprintf.c: New file.
Diffstat (limited to 'newlib/libc/stdio/vswprintf.c')
| -rw-r--r-- | newlib/libc/stdio/vswprintf.c | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/newlib/libc/stdio/vswprintf.c b/newlib/libc/stdio/vswprintf.c new file mode 100644 index 0000000..5c70f1b --- /dev/null +++ b/newlib/libc/stdio/vswprintf.c @@ -0,0 +1,71 @@ +/* + * Copyright (c) 1990 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. + */ +/* doc in vfwprintf.c */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "%W% (Berkeley) %G%"; +#endif /* LIBC_SCCS and not lint */ + +#include <_ansi.h> +#include <reent.h> +#include <stdio.h> +#include <wchar.h> +#include <limits.h> +#include <stdarg.h> +#include <errno.h> + +int +_DEFUN(_vswprintf_r, (ptr, str, size, fmt, ap), + struct _reent *ptr _AND + wchar_t *str _AND + size_t size _AND + const wchar_t *fmt _AND + va_list ap) +{ + int ret; + FILE f; + + if (size > INT_MAX / sizeof (wchar_t)) + { + ptr->_errno = EOVERFLOW; + return EOF; + } + f._flags = __SWR | __SSTR; + f._bf._base = f._p = (unsigned char *) str; + f._bf._size = f._w = (size > 0 ? (size - 1) * sizeof (wchar_t) : 0); + f._file = -1; /* No file. */ + ret = _svfwprintf_r (ptr, &f, fmt, ap); + if (ret < EOF) + ptr->_errno = EOVERFLOW; + if (size > 0) + *f._p = 0; + return ret; +} + +#ifndef _REENT_ONLY + +int +_DEFUN(vswprintf, (str, size, fmt, ap), + wchar_t *str _AND + size_t size _AND + const wchar_t *fmt _AND + va_list ap) +{ + return _vswprintf_r (_REENT, str, size, fmt, ap); +} + +#endif /* !_REENT_ONLY */ |