From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 2CF0C3854172; Wed, 13 Jul 2022 08:19:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2CF0C3854172 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_STDOUT(ptr) X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: 627a5cb4133ece2a80dbca27c403d4ceb3139130 X-Git-Newrev: 3266a463274789de3d805667a851c08bf5b36c18 Message-Id: <20220713081928.2CF0C3854172@sourceware.org> Date: Wed, 13 Jul 2022 08:19:28 +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:28 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D3266a463274= 789de3d805667a851c08bf5b36c18 commit 3266a463274789de3d805667a851c08bf5b36c18 Author: Matt Joyce Date: Tue Feb 1 12:37:46 2022 +0100 Add _REENT_STDOUT(ptr) =20 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. Diff: --- newlib/libc/include/stdio.h | 4 ++-- newlib/libc/include/sys/reent.h | 1 + newlib/libc/include/wchar.h | 4 ++-- newlib/libc/machine/spu/stdio.c | 4 ++-- newlib/libc/stdio/findfp.c | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h index c802b3737..95cc55fa9 100644 --- a/newlib/libc/include/stdio.h +++ b/newlib/libc/include/stdio.h @@ -168,11 +168,11 @@ typedef _ssize_t ssize_t; #define TMP_MAX 26 =20 #define stdin _REENT_STDIN(_REENT) -#define stdout (_REENT->_stdout) +#define stdout _REENT_STDOUT(_REENT) #define stderr (_REENT->_stderr) =20 #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) =20 /* diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index 801fe20f4..652a330cb 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -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) =20 #define _REENT_INIT_PTR(var) \ { memset((var), 0, sizeof(*(var))); \ diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h index 5e9202820..7c37427e6 100644 --- a/newlib/libc/include/wchar.h +++ b/newlib/libc/include/wchar.h @@ -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)) =20 #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 =20 _END_STD_C diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdi= o.c index 756628303..769b8f1c9 100644 --- a/newlib/libc/machine/spu/stdio.c +++ b/newlib/libc/machine/spu/stdio.c @@ -70,8 +70,8 @@ __sinit (struct _reent *s) _REENT_STDIN(s) =3D &s->__sf[0]; _REENT_STDIN(s)->_fp =3D SPE_STDIN; =20 - s->_stdout =3D &s->__sf[1]; - s->_stdout->_fp =3D SPE_STDOUT; + _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; diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index d2292d3e0..04e3517a7 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -220,8 +220,8 @@ cleanup_stdio (struct _reent *ptr) { if (_REENT_STDIN(ptr) !=3D &__sf[0]) CLEANUP_FILE (ptr, _REENT_STDIN(ptr)); - if (ptr->_stdout !=3D &__sf[1]) - CLEANUP_FILE (ptr, ptr->_stdout); + if (_REENT_STDOUT(ptr) !=3D &__sf[1]) + CLEANUP_FILE (ptr, _REENT_STDOUT(ptr)); if (ptr->_stderr !=3D &__sf[2]) CLEANUP_FILE (ptr, ptr->_stderr); }