From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 33491385C318; Wed, 13 Jul 2022 08:19:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33491385C318 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Add _REENT_STDERR(ptr) X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: 3266a463274789de3d805667a851c08bf5b36c18 X-Git-Newrev: e56801f34d798eafa054b383de5bf2df986576cc Message-Id: <20220713081933.33491385C318@sourceware.org> Date: Wed, 13 Jul 2022 08:19:33 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2022 08:19:33 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3De56801f34d7= 98eafa054b383de5bf2df986576cc commit e56801f34d798eafa054b383de5bf2df986576cc Author: Matt Joyce Date: Tue Feb 1 13:05:53 2022 +0100 Add _REENT_STDERR(ptr) =20 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. Diff: --- newlib/libc/include/stdio.h | 4 ++-- newlib/libc/include/sys/reent.h | 1 + newlib/libc/machine/spu/stdio.c | 4 ++-- newlib/libc/stdio/findfp.c | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h index 95cc55fa9..c75e48125 100644 --- a/newlib/libc/include/stdio.h +++ b/newlib/libc/include/stdio.h @@ -169,11 +169,11 @@ typedef _ssize_t ssize_t; =20 #define stdin _REENT_STDIN(_REENT) #define stdout _REENT_STDOUT(_REENT) -#define stderr (_REENT->_stderr) +#define stderr _REENT_STDERR(_REENT) =20 #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) =20 /* * Functions defined in ANSI C standard. diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index 652a330cb..c0647cfd9 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -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) =20 #define _REENT_INIT_PTR(var) \ { memset((var), 0, sizeof(*(var))); \ diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdi= o.c index 769b8f1c9..83a60c06b 100644 --- a/newlib/libc/machine/spu/stdio.c +++ b/newlib/libc/machine/spu/stdio.c @@ -73,8 +73,8 @@ __sinit (struct _reent *s) _REENT_STDOUT(s) =3D &s->__sf[1]; _REENT_STDOUT(s)->_fp =3D SPE_STDOUT; =20 - s->_stderr =3D &s->__sf[2]; - s->_stderr->_fp =3D SPE_STDERR; + _REENT_STDERR(s) =3D &s->__sf[2]; + _REENT_STDERR(s)->_fp =3D SPE_STDERR; } =20 void diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 04e3517a7..3c888d03c 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -222,8 +222,8 @@ cleanup_stdio (struct _reent *ptr) CLEANUP_FILE (ptr, _REENT_STDIN(ptr)); if (_REENT_STDOUT(ptr) !=3D &__sf[1]) CLEANUP_FILE (ptr, _REENT_STDOUT(ptr)); - if (ptr->_stderr !=3D &__sf[2]) - CLEANUP_FILE (ptr, ptr->_stderr); + if (_REENT_STDERR(ptr) !=3D &__sf[2]) + CLEANUP_FILE (ptr, _REENT_STDERR(ptr)); } =20 /*