mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-03-03 21:45:51 +08:00
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:
parent
3266a46327
commit
e56801f34d
@ -169,11 +169,11 @@ typedef _ssize_t ssize_t;
|
|||||||
|
|
||||||
#define stdin _REENT_STDIN(_REENT)
|
#define stdin _REENT_STDIN(_REENT)
|
||||||
#define stdout _REENT_STDOUT(_REENT)
|
#define stdout _REENT_STDOUT(_REENT)
|
||||||
#define stderr (_REENT->_stderr)
|
#define stderr _REENT_STDERR(_REENT)
|
||||||
|
|
||||||
#define _stdin_r(x) _REENT_STDIN(x)
|
#define _stdin_r(x) _REENT_STDIN(x)
|
||||||
#define _stdout_r(x) _REENT_STDOUT(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.
|
* Functions defined in ANSI C standard.
|
||||||
|
@ -722,6 +722,7 @@ struct _reent
|
|||||||
#define _REENT_ERRNO(_ptr) ((_ptr)->_errno)
|
#define _REENT_ERRNO(_ptr) ((_ptr)->_errno)
|
||||||
#define _REENT_STDIN(_ptr) ((_ptr)->_stdin)
|
#define _REENT_STDIN(_ptr) ((_ptr)->_stdin)
|
||||||
#define _REENT_STDOUT(_ptr) ((_ptr)->_stdout)
|
#define _REENT_STDOUT(_ptr) ((_ptr)->_stdout)
|
||||||
|
#define _REENT_STDERR(_ptr) ((_ptr)->_stderr)
|
||||||
|
|
||||||
#define _REENT_INIT_PTR(var) \
|
#define _REENT_INIT_PTR(var) \
|
||||||
{ memset((var), 0, sizeof(*(var))); \
|
{ memset((var), 0, sizeof(*(var))); \
|
||||||
|
@ -73,8 +73,8 @@ __sinit (struct _reent *s)
|
|||||||
_REENT_STDOUT(s) = &s->__sf[1];
|
_REENT_STDOUT(s) = &s->__sf[1];
|
||||||
_REENT_STDOUT(s)->_fp = SPE_STDOUT;
|
_REENT_STDOUT(s)->_fp = SPE_STDOUT;
|
||||||
|
|
||||||
s->_stderr = &s->__sf[2];
|
_REENT_STDERR(s) = &s->__sf[2];
|
||||||
s->_stderr->_fp = SPE_STDERR;
|
_REENT_STDERR(s)->_fp = SPE_STDERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -222,8 +222,8 @@ cleanup_stdio (struct _reent *ptr)
|
|||||||
CLEANUP_FILE (ptr, _REENT_STDIN(ptr));
|
CLEANUP_FILE (ptr, _REENT_STDIN(ptr));
|
||||||
if (_REENT_STDOUT(ptr) != &__sf[1])
|
if (_REENT_STDOUT(ptr) != &__sf[1])
|
||||||
CLEANUP_FILE (ptr, _REENT_STDOUT(ptr));
|
CLEANUP_FILE (ptr, _REENT_STDOUT(ptr));
|
||||||
if (ptr->_stderr != &__sf[2])
|
if (_REENT_STDERR(ptr) != &__sf[2])
|
||||||
CLEANUP_FILE (ptr, ptr->_stderr);
|
CLEANUP_FILE (ptr, _REENT_STDERR(ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user