From: Sebastian Huber <sebastian.huber@embedded-brains.de>
To: newlib@sourceware.org
Subject: [PATCH 11/14] Add _REENT_CVTBUF(ptr)
Date: Tue, 21 Jun 2022 14:49:28 +0200 [thread overview]
Message-ID: <20220621124931.36450-12-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_CVTBUF() macro to encapsulate access to the _cvtbuf
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/sys/reent.h | 1 +
newlib/libc/reent/reent.c | 4 ++--
newlib/libc/stdlib/ecvtbuf.c | 12 ++++++------
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 8c88fae20..ef05dd8c9 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -719,6 +719,7 @@ struct _reent
#endif /* !_REENT_SMALL */
#define _REENT_CLEANUP(_ptr) ((_ptr)->__cleanup)
+#define _REENT_CVTBUF(_ptr) ((_ptr)->_cvtbuf)
#define _REENT_CVTLEN(_ptr) ((_ptr)->_cvtlen)
#define _REENT_EMERGENCY(_ptr) ((_ptr)->_emergency)
#define _REENT_ERRNO(_ptr) ((_ptr)->_errno)
diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c
index 16ac04e22..2cfec5363 100644
--- a/newlib/libc/reent/reent.c
+++ b/newlib/libc/reent/reent.c
@@ -78,8 +78,8 @@ _reclaim_reent (struct _reent *ptr)
_free_r (ptr, ptr->_misc);
#endif
- if (ptr->_cvtbuf)
- _free_r (ptr, ptr->_cvtbuf);
+ if (_REENT_CVTBUF(ptr))
+ _free_r (ptr, _REENT_CVTBUF(ptr));
/* We should free _sig_func to avoid a memory leak, but how to
do it safely considering that a signal may be delivered immediately
after the free?
diff --git a/newlib/libc/stdlib/ecvtbuf.c b/newlib/libc/stdlib/ecvtbuf.c
index 0e776ab65..05f315108 100644
--- a/newlib/libc/stdlib/ecvtbuf.c
+++ b/newlib/libc/stdlib/ecvtbuf.c
@@ -232,14 +232,14 @@ fcvtbuf (double invalue,
{
if (_REENT_CVTLEN(reent) <= ndigit + 35)
{
- if ((fcvt_buf = (char *) _realloc_r (reent, reent->_cvtbuf,
+ if ((fcvt_buf = (char *) _realloc_r (reent, _REENT_CVTBUF(reent),
ndigit + 36)) == NULL)
return NULL;
_REENT_CVTLEN(reent) = ndigit + 36;
- reent->_cvtbuf = fcvt_buf;
+ _REENT_CVTBUF(reent) = fcvt_buf;
}
- fcvt_buf = reent->_cvtbuf ;
+ fcvt_buf = _REENT_CVTBUF(reent) ;
}
save = fcvt_buf;
@@ -281,14 +281,14 @@ ecvtbuf (double invalue,
{
if (_REENT_CVTLEN(reent) <= ndigit)
{
- if ((fcvt_buf = (char *) _realloc_r (reent, reent->_cvtbuf,
+ if ((fcvt_buf = (char *) _realloc_r (reent, _REENT_CVTBUF(reent),
ndigit + 1)) == NULL)
return NULL;
_REENT_CVTLEN(reent) = ndigit + 1;
- reent->_cvtbuf = fcvt_buf;
+ _REENT_CVTBUF(reent) = fcvt_buf;
}
- fcvt_buf = reent->_cvtbuf ;
+ fcvt_buf = _REENT_CVTBUF(reent) ;
}
save = fcvt_buf;
--
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 ` [PATCH 05/14] Add _REENT_STDOUT(ptr) Sebastian Huber
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 ` Sebastian Huber [this message]
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-12-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).