drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add _REENT_STDERR(ptr) 

Add a _REENT_STDERR() macro to encapsulate access to the _stderr
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 13:05:53 +01:00 committed by Sebastian Huber
parent 3266a46327
commit e56801f34d
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,11 +169,11 @@ typedef _ssize_t ssize_t;
#define stdin _REENT_STDIN(_REENT)
#define stdout _REENT_STDOUT(_REENT)
#define stderr (_REENT->_stderr)
#define stderr _REENT_STDERR(_REENT)
#define _stdin_r(x) _REENT_STDIN(x)
#define _stdout_r(x) _REENT_STDOUT(x)
#define _stderr_r(x) ((x)->_stderr)
#define _stderr_r(x) _REENT_STDERR(x)
/*
* Functions defined in ANSI C standard.

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

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

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

@ -73,8 +73,8 @@ __sinit (struct _reent *s)
_REENT_STDOUT(s) = &s->__sf[1];
_REENT_STDOUT(s)->_fp = SPE_STDOUT;
s->_stderr = &s->__sf[2];
s->_stderr->_fp = SPE_STDERR;
_REENT_STDERR(s) = &s->__sf[2];
_REENT_STDERR(s)->_fp = SPE_STDERR;
}
void

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

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