From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 51BF33857BBC; Wed, 13 Jul 2022 08:19:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 51BF33857BBC 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_CVTLEN(ptr) X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: f89ce35d83c705cfb9ae0564d1999f39c4e8fa83 X-Git-Newrev: 315c420e1becee5dc5dbe6fad5ffc1a447ea2e48 Message-Id: <20220713081953.51BF33857BBC@sourceware.org> Date: Wed, 13 Jul 2022 08:19:53 +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:53 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D315c420e1be= cee5dc5dbe6fad5ffc1a447ea2e48 commit 315c420e1becee5dc5dbe6fad5ffc1a447ea2e48 Author: Matt Joyce Date: Thu Feb 3 11:19:14 2022 +0100 Add _REENT_CVTLEN(ptr) =20 Add a _REENT_CVTLEN() macro to encapsulate access to the _cvtlen 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/stdlib/ecvtbuf.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index 3d277638f..8c88fae20 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_CVTLEN(_ptr) ((_ptr)->_cvtlen) #define _REENT_EMERGENCY(_ptr) ((_ptr)->_emergency) #define _REENT_ERRNO(_ptr) ((_ptr)->_errno) #define _REENT_INC(_ptr) ((_ptr)->_inc) diff --git a/newlib/libc/stdlib/ecvtbuf.c b/newlib/libc/stdlib/ecvtbuf.c index 0cb11f889..0e776ab65 100644 --- a/newlib/libc/stdlib/ecvtbuf.c +++ b/newlib/libc/stdlib/ecvtbuf.c @@ -230,12 +230,12 @@ fcvtbuf (double invalue, =20 if (fcvt_buf =3D=3D NULL) { - if (reent->_cvtlen <=3D ndigit + 35) + if (_REENT_CVTLEN(reent) <=3D ndigit + 35) { if ((fcvt_buf =3D (char *) _realloc_r (reent, reent->_cvtbuf, ndigit + 36)) =3D=3D NULL) return NULL; - reent->_cvtlen =3D ndigit + 36; + _REENT_CVTLEN(reent) =3D ndigit + 36; reent->_cvtbuf =3D fcvt_buf; } =20 @@ -279,12 +279,12 @@ ecvtbuf (double invalue, =20 if (fcvt_buf =3D=3D NULL) { - if (reent->_cvtlen <=3D ndigit) + if (_REENT_CVTLEN(reent) <=3D ndigit) { if ((fcvt_buf =3D (char *) _realloc_r (reent, reent->_cvtbuf, ndigit + 1)) =3D=3D NULL) return NULL; - reent->_cvtlen =3D ndigit + 1; + _REENT_CVTLEN(reent) =3D ndigit + 1; reent->_cvtbuf =3D fcvt_buf; }