diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2013-04-29 21:06:23 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2013-04-29 21:06:23 +0000 |
| commit | b334e6660a405d2d63166ad9e4560421e6810cdc (patch) | |
| tree | 08690339ed7959e88c00c4ac33406843dbc3ad62 /newlib/libc/stdlib/wcrtomb.c | |
| parent | 2a55aa79a9fcef6b8d1bd0264ed91d0c6420d783 (diff) | |
| download | newlib-b334e6660a405d2d63166ad9e4560421e6810cdc.zip newlib-b334e6660a405d2d63166ad9e4560421e6810cdc.tar.gz newlib-b334e6660a405d2d63166ad9e4560421e6810cdc.tar.bz2 | |
2013-04-29 Sebastian Huber <sebastian.huber@embedded-brains.de>
* 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.
Diffstat (limited to 'newlib/libc/stdlib/wcrtomb.c')
| -rw-r--r-- | newlib/libc/stdlib/wcrtomb.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/newlib/libc/stdlib/wcrtomb.c b/newlib/libc/stdlib/wcrtomb.c index 60e0d89..b634c23 100644 --- a/newlib/libc/stdlib/wcrtomb.c +++ b/newlib/libc/stdlib/wcrtomb.c @@ -50,25 +50,26 @@ _DEFUN (wcrtomb, (s, wc, ps), 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)); + _REENT_CHECK_MISC(reent); + ps = &(_REENT_WCRTOMB_STATE(reent)); } #endif if (s == NULL) - retval = __wctomb (_REENT, buf, L'\0', __locale_charset (), ps); + retval = __wctomb (reent, buf, L'\0', __locale_charset (), ps); else - retval = __wctomb (_REENT, s, wc, __locale_charset (), ps); + retval = __wctomb (reent, s, wc, __locale_charset (), ps); if (retval == -1) { ps->__count = 0; - _REENT->_errno = EILSEQ; + reent->_errno = EILSEQ; return (size_t)(-1); } else |