libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-01-19 04:49:25 +08:00
Code Issues Projects Releases Wiki Activity

Add _REENT_STDOUT(ptr)

Browse Source 
Add a _REENT_STDOUT() macro to encapsulate access to the _stdout
member of struct reent. This will help to replace the struct
member with a thread-local storage object in a follow up patch.
This commit is contained in:
Matt Joyce 2022-02-01 12:37:46 +01:00 committed by Sebastian Huber
parent 627a5cb413
commit 3266a46327
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/libc/include/stdio.h
View File

@ -168,11 +168,11 @@ typedef _ssize_t ssize_t;
#define TMP_MAX 26
#define stdin _REENT_STDIN(_REENT)
#define stdout (_REENT->_stdout)
#define stdout _REENT_STDOUT(_REENT)
#define stderr (_REENT->_stderr)
#define _stdin_r(x) _REENT_STDIN(x)
#define _stdout_r(x) ((x)->_stdout)
#define _stdout_r(x) _REENT_STDOUT(x)
#define _stderr_r(x) ((x)->_stderr)
/*

1
newlib/libc/include/sys/reent.h
View File

@ -721,6 +721,7 @@ struct _reent
#define _REENT_EMERGENCY(_ptr) ((_ptr)->_emergency)
#define _REENT_ERRNO(_ptr) ((_ptr)->_errno)
#define _REENT_STDIN(_ptr) ((_ptr)->_stdin)
#define _REENT_STDOUT(_ptr) ((_ptr)->_stdout)
#define _REENT_INIT_PTR(var) \
{ memset((var), 0, sizeof(*(var))); \

4
newlib/libc/include/wchar.h
View File

@ -321,13 +321,13 @@ int _wscanf_r (struct _reent *, const wchar_t *, ...);
#define getwc(fp) fgetwc(fp)
#define putwc(wc,fp) fputwc((wc), (fp))
#define getwchar() fgetwc(_REENT_STDIN(_REENT))
#define putwchar(wc) fputwc((wc), _REENT->_stdout)
#define putwchar(wc) fputwc((wc), _REENT_STDOUT(_REENT))
#if __GNU_VISIBLE
#define getwc_unlocked(fp) fgetwc_unlocked(fp)
#define putwc_unlocked(wc,fp) fputwc_unlocked((wc), (fp))
#define getwchar_unlocked() fgetwc_unlocked(_REENT_STDIN(_REENT))
#define putwchar_unlocked(wc) fputwc_unlocked((wc), _REENT->_stdout)
#define putwchar_unlocked(wc) fputwc_unlocked((wc), _REENT_STDOUT(_REENT))
#endif
_END_STD_C

4
newlib/libc/machine/spu/stdio.c
View File

@ -70,8 +70,8 @@ __sinit (struct _reent *s)
_REENT_STDIN(s) = &s->__sf[0];
_REENT_STDIN(s)->_fp = SPE_STDIN;
s->_stdout = &s->__sf[1];
s->_stdout->_fp = SPE_STDOUT;
_REENT_STDOUT(s) = &s->__sf[1];
_REENT_STDOUT(s)->_fp = SPE_STDOUT;
s->_stderr = &s->__sf[2];
s->_stderr->_fp = SPE_STDERR;

4
newlib/libc/stdio/findfp.c
View File

@ -220,8 +220,8 @@ cleanup_stdio (struct _reent *ptr)
{
if (_REENT_STDIN(ptr) != &__sf[0])
CLEANUP_FILE (ptr, _REENT_STDIN(ptr));
if (ptr->_stdout != &__sf[1])
CLEANUP_FILE (ptr, ptr->_stdout);
if (_REENT_STDOUT(ptr) != &__sf[1])
CLEANUP_FILE (ptr, _REENT_STDOUT(ptr));
if (ptr->_stderr != &__sf[2])
CLEANUP_FILE (ptr, ptr->_stderr);
}