From: Sebastian Huber <sebastian.huber@embedded-brains.de>
To: newlib@sourceware.org
Subject: [PATCH 05/14] Add _REENT_STDOUT(ptr)
Date: Tue, 21 Jun 2022 14:49:22 +0200 [thread overview]
Message-ID: <20220621124931.36450-6-sebastian.huber@embedded-brains.de> (raw)
In-Reply-To: <20220621124931.36450-1-sebastian.huber@embedded-brains.de>
From: Matt Joyce <matthew.joyce@embedded-brains.de>
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.
---
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
#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)
/*
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.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)
#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))
#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
diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdio.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) = &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;
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) != &__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);
}
--
2.35.3
next prev parent reply other threads:[~2022-06-21 12:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 12:49 [PATCH 00/14] Add --enable-newlib-reent-thread-local option Sebastian Huber
2022-06-21 12:49 ` [PATCH 01/14] Move content in <sys/reent.h> Sebastian Huber
2022-06-21 12:49 ` [PATCH 02/14] Define _REENT_EMERGENCY(ptr) only once Sebastian Huber
2022-06-21 12:49 ` [PATCH 03/14] Add _REENT_ERRNO(ptr) Sebastian Huber
[not found] ` <BN2P110MB15447CD8C6DD815779AA7E4C9AB39@BN2P110MB1544.NAMP110.PROD.OUTLOOK.COM>
2022-06-21 14:41 ` Fw: " C Howland
2022-06-23 10:55 ` Sebastian Huber
2022-07-11 7:41 ` Sebastian Huber
2022-07-12 16:11 ` Corinna Vinschen
2022-07-12 16:38 ` Sebastian Huber
2022-07-12 18:25 ` Corinna Vinschen
2022-07-13 7:17 ` Sebastian Huber
2022-07-13 7:50 ` Corinna Vinschen
2022-07-13 8:19 ` Sebastian Huber
2022-07-13 11:13 ` Corinna Vinschen
2022-06-21 12:49 ` [PATCH 04/14] Add _REENT_STDIN(ptr) Sebastian Huber
2022-06-21 12:49 ` Sebastian Huber [this message]
2022-06-21 12:49 ` [PATCH 06/14] Add _REENT_STDERR(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 07/14] Add _REENT_INC(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 08/14] Add _REENT_LOCALE(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 09/14] Add _REENT_CLEANUP(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 10/14] Add _REENT_CVTLEN(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 11/14] Add _REENT_CVTBUF(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 12/14] Add _REENT_SIG_FUNC(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 13/14] Add _REENT_IS_NULL() Sebastian Huber
2022-06-21 12:49 ` [PATCH 14/14] Add --enable-newlib-reent-thread-local option Sebastian Huber
2022-06-21 13:59 ` Torbjorn SVENSSON
2022-06-21 15:10 ` Sebastian Huber
2022-07-12 11:18 ` [PATCH 00/14] " Sebastian Huber
2022-07-12 14:45 ` Corinna Vinschen
2022-07-12 15:53 ` Sebastian Huber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220621124931.36450-6-sebastian.huber@embedded-brains.de \
--to=sebastian.huber@embedded-brains.de \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).