From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 5AF47385803D; Wed, 13 Jul 2022 08:19:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AF47385803D 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_CVTBUF(ptr) X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: 315c420e1becee5dc5dbe6fad5ffc1a447ea2e48 X-Git-Newrev: 81352a9df9d7c8ce9f9dc63126e4cfbd8ff4a082 Message-Id: <20220713081958.5AF47385803D@sourceware.org> Date: Wed, 13 Jul 2022 08:19:58 +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:58 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D81352a9df9d= 7c8ce9f9dc63126e4cfbd8ff4a082 commit 81352a9df9d7c8ce9f9dc63126e4cfbd8ff4a082 Author: Matt Joyce Date: Thu Feb 3 12:24:26 2022 +0100 Add _REENT_CVTBUF(ptr) =20 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. Diff: --- 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/reen= t.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 */ =20 #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 =20 - 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) <=3D ndigit + 35) { - if ((fcvt_buf =3D (char *) _realloc_r (reent, reent->_cvtbuf, + if ((fcvt_buf =3D (char *) _realloc_r (reent, _REENT_CVTBUF(reent), ndigit + 36)) =3D=3D NULL) return NULL; _REENT_CVTLEN(reent) =3D ndigit + 36; - reent->_cvtbuf =3D fcvt_buf; + _REENT_CVTBUF(reent) =3D fcvt_buf; } =20 - fcvt_buf =3D reent->_cvtbuf ; + fcvt_buf =3D _REENT_CVTBUF(reent) ; } =20 save =3D fcvt_buf; @@ -281,14 +281,14 @@ ecvtbuf (double invalue, { if (_REENT_CVTLEN(reent) <=3D ndigit) { - if ((fcvt_buf =3D (char *) _realloc_r (reent, reent->_cvtbuf, + if ((fcvt_buf =3D (char *) _realloc_r (reent, _REENT_CVTBUF(reent), ndigit + 1)) =3D=3D NULL) return NULL; _REENT_CVTLEN(reent) =3D ndigit + 1; - reent->_cvtbuf =3D fcvt_buf; + _REENT_CVTBUF(reent) =3D fcvt_buf; } =20 - fcvt_buf =3D reent->_cvtbuf ; + fcvt_buf =3D _REENT_CVTBUF(reent) ; } =20 save =3D fcvt_buf;