mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 11:00:04 +08:00
b334e6660a
* libc/stdio/local.h (CHECK_INIT): Evaluate argument only once. (CHECK_STD_INIT): Likewise. * libc/stdio/fgetc.c (fgetc): Use local variable for _REENT. * libc/stdio/fgetwc.c (fwgetc): Likewise. * libc/stdio/fgetws.c (fgetws): Likewise. * libc/stdio/fputc.c (fputc): Likewise. * libc/stdio/fputwc.c (fputwc): Likewise. * libc/stdio/fputws.c (fputws): Likewise. * libc/stdio/getc.c (getc): Likewise. * libc/stdio/getchar.c (_getchar_r): Likewise. * libc/stdio/putc.c (putc): Likewise. * libc/stdio/putchar.c (putchar): Likewise. * libc/stdio/scanf.c (scanf): Likewise. * libc/stdio/setvbuf.c (setvbuf): Likewise. * libc/stdio/ungetwc.c (ungetwc): Likewise. * libc/stdio/vfscanf.c (VFSCANF): Likewise. * libc/stdio/vfwscanf.c (VFWSCANF): Likewise. * libc/stdio/viprintf.c (viprintf): Likewise. * libc/stdio/viscanf.c (viscanf): Likewise. * libc/stdio/vprintf.c (vprintf): Likewise. * libc/stdio/vscanf.c (vscanf): Likewise. * libc/stdio/vwprintf.c (vwprintf): Likewise. * libc/stdio/vwscanf.c (vwscanf): Likewise. * libc/stdio/wscanf.c (wscanf): Likewise. * libc/stdlib/ecvtbuf.c (fcvtbuf): Likewise. (fcvtbuf): Likewise. (ecvtbuf): Likewise. (ecvtbuf): Likewise. * libc/stdlib/mblen.c (mblen): Likewise. * libc/stdlib/mbrlen.c (mbrlen): Likewise. * libc/stdlib/mbrtowc.c (mbrtowc): Likewise. * libc/stdlib/mbtowc.c (mbtowc): Likewise. * libc/stdlib/rand.c (srand): Likewise. (rand): Likewise. * libc/stdlib/wcrtomb.c (wcrtomb): Likewise. * libc/stdlib/wctob.c (wctob): Likewise. * libc/stdlib/wctomb.c (wctomb): Likewise. * libc/string/strtok.c (strtok): Likewise. * libc/time/asctime.c (asctime): Likewise. * libc/time/gmtime.c (gmtime): Likewise. * libc/time/lcltime.c (lcltime): Likewise.
80 lines
1.5 KiB
C
80 lines
1.5 KiB
C
#include <reent.h>
|
|
#include <newlib.h>
|
|
#include <wchar.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#include "local.h"
|
|
|
|
size_t
|
|
_DEFUN (_wcrtomb_r, (ptr, s, wc, ps),
|
|
struct _reent *ptr _AND
|
|
char *s _AND
|
|
wchar_t wc _AND
|
|
mbstate_t *ps)
|
|
{
|
|
int retval = 0;
|
|
char buf[10];
|
|
|
|
#ifdef _MB_CAPABLE
|
|
if (ps == NULL)
|
|
{
|
|
_REENT_CHECK_MISC(ptr);
|
|
ps = &(_REENT_WCRTOMB_STATE(ptr));
|
|
}
|
|
#endif
|
|
|
|
if (s == NULL)
|
|
retval = __wctomb (ptr, buf, L'\0', __locale_charset (), ps);
|
|
else
|
|
retval = __wctomb (ptr, s, wc, __locale_charset (), ps);
|
|
|
|
if (retval == -1)
|
|
{
|
|
ps->__count = 0;
|
|
ptr->_errno = EILSEQ;
|
|
return (size_t)(-1);
|
|
}
|
|
else
|
|
return (size_t)retval;
|
|
}
|
|
|
|
#ifndef _REENT_ONLY
|
|
size_t
|
|
_DEFUN (wcrtomb, (s, wc, ps),
|
|
char *s _AND
|
|
wchar_t wc _AND
|
|
mbstate_t *ps)
|
|
{
|
|
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
|
|
return _wcrtomb_r (_REENT, s, wc, ps);
|
|
#else
|
|
int retval = 0;
|
|
struct _reent *reent = _REENT;
|
|
char buf[10];
|
|
|
|
#ifdef _MB_CAPABLE
|
|
if (ps == NULL)
|
|
{
|
|
_REENT_CHECK_MISC(reent);
|
|
ps = &(_REENT_WCRTOMB_STATE(reent));
|
|
}
|
|
#endif
|
|
|
|
if (s == NULL)
|
|
retval = __wctomb (reent, buf, L'\0', __locale_charset (), ps);
|
|
else
|
|
retval = __wctomb (reent, s, wc, __locale_charset (), ps);
|
|
|
|
if (retval == -1)
|
|
{
|
|
ps->__count = 0;
|
|
reent->_errno = EILSEQ;
|
|
return (size_t)(-1);
|
|
}
|
|
else
|
|
return (size_t)retval;
|
|
#endif /* not PREFER_SIZE_OVER_SPEED */
|
|
}
|
|
#endif /* !_REENT_ONLY */
|