From: Matthew Joyce <matthew.joyce@embedded-brains.de>
To: newlib@sourceware.org
Subject: [PATCH 06/11] Move __sglue initializations to __sfp()
Date: Tue, 10 May 2022 10:09:22 +0200 [thread overview]
Message-ID: <20220510080927.28839-7-matthew.joyce@embedded-brains.de> (raw)
In-Reply-To: <20220510080927.28839-1-matthew.joyce@embedded-brains.de>
From: Matt Joyce <matthew.joyce@embedded-brains.de>
Moved last remaining __sglue initializations from __sinit() to
__sfp(). The move better encapsulates access to __sglue and
facilitates its decoupling from struct _reent in a follow-on patch.
---
newlib/libc/stdio/findfp.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index afbdad9b1..7434c343c 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -151,8 +151,14 @@ __sfp (struct _reent *d)
_newlib_sfp_lock_start ();
- if (_GLOBAL_REENT->__cleanup == NULL)
+ if (_GLOBAL_REENT->__cleanup == NULL) {
+#ifdef _REENT_GLOBAL_STDIO_STREAMS
+ _GLOBAL_REENT->__sglue._niobs = 3;
+ _GLOBAL_REENT->__sglue._iobs = &__sf[0];
+#endif
__sinit (_GLOBAL_REENT);
+ }
+
for (g = &_GLOBAL_REENT->__sglue;; g = g->_next)
{
for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
@@ -256,8 +262,6 @@ __sinit (struct _reent *s)
#ifdef _REENT_GLOBAL_STDIO_STREAMS
if (__sf[0]._cookie == NULL) {
- _GLOBAL_REENT->__sglue._niobs = 3;
- _GLOBAL_REENT->__sglue._iobs = &__sf[0];
stdin_init (&__sf[0]);
stdout_init (&__sf[1]);
stderr_init (&__sf[2]);
--
2.31.1
next prev parent reply other threads:[~2022-05-10 8:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 8:09 [PATCH 00/11] Decouple global file object list from _GLOBAL_REENT Matthew Joyce
2022-05-10 8:09 ` [PATCH 01/11] Remove duplicate stdio initializations Matthew Joyce
2022-05-10 8:09 ` [PATCH 02/11] Remove duplicate sglue initializations Matthew Joyce
2022-05-10 8:09 ` [PATCH 03/11] Declare global __sf[] only once Matthew Joyce
2022-05-10 8:09 ` [PATCH 04/11] Add two __sglue initialization macros Matthew Joyce
2022-05-10 8:09 ` [PATCH 05/11] Remove __sinit_locks / __sinit_recursive_mutex Matthew Joyce
2022-05-10 8:09 ` Matthew Joyce [this message]
2022-05-10 8:09 ` [PATCH 07/11] Add CLEANUP_FILE define Matthew Joyce
2022-05-10 8:09 ` [PATCH 08/11] Add stdio atexit handler Matthew Joyce
2022-05-11 15:23 ` Corinna Vinschen
2022-05-11 16:54 ` Corinna Vinschen
2022-05-11 17:51 ` Sebastian Huber
2022-05-11 17:51 ` Sebastian Huber
2022-05-10 8:09 ` [PATCH 09/11] stdio: Replace _fwalk_reent() with _fwalk_sglue() Matthew Joyce
2022-05-11 15:56 ` Corinna Vinschen
2022-05-11 17:55 ` Sebastian Huber
2022-05-12 7:59 ` Corinna Vinschen
2022-05-10 8:09 ` [PATCH 10/11] Add global __sglue object for all configurations Matthew Joyce
2022-05-10 8:09 ` [PATCH 11/11] Remove __sglue member for one configuration Matthew Joyce
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=20220510080927.28839-7-matthew.joyce@embedded-brains.de \
--to=matthew.joyce@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).