From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dedi548.your-server.de (dedi548.your-server.de [85.10.215.148]) by sourceware.org (Postfix) with ESMTPS id C998F3857361 for ; Tue, 21 Jun 2022 12:49:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C998F3857361 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embedded-brains.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embedded-brains.de Received: from sslproxy02.your-server.de ([78.47.166.47]) by dedi548.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o3dK2-0003Yz-W4 for newlib@sourceware.org; Tue, 21 Jun 2022 14:49:35 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy02.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o3dK3-000LhX-62 for newlib@sourceware.org; Tue, 21 Jun 2022 14:49:35 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id D7CC44801EC for ; Tue, 21 Jun 2022 14:49:34 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id BBdJwVTNAQNW for ; Tue, 21 Jun 2022 14:49:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 75AF54801DC for ; Tue, 21 Jun 2022 14:49:34 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id sSigsLKYgOVD for ; Tue, 21 Jun 2022 14:49:34 +0200 (CEST) Received: from zimbra.eb.localhost (unknown [192.168.96.242]) by mail.embedded-brains.de (Postfix) with ESMTPSA id 4D07F480140 for ; Tue, 21 Jun 2022 14:49:34 +0200 (CEST) From: Sebastian Huber To: newlib@sourceware.org Subject: [PATCH 06/14] Add _REENT_STDERR(ptr) Date: Tue, 21 Jun 2022 14:49:23 +0200 Message-Id: <20220621124931.36450-7-sebastian.huber@embedded-brains.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220621124931.36450-1-sebastian.huber@embedded-brains.de> References: <20220621124931.36450-1-sebastian.huber@embedded-brains.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authenticated-Sender: smtp-embedded@poldinet.de X-Virus-Scanned: Clear (ClamAV 0.103.6/26579/Tue Jun 21 10:15:30 2022) X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2022 12:49:39 -0000 From: Matt Joyce Add a _REENT_STDERR() macro to encapsulate access to the _stderr 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/machine/spu/stdio.c | 4 ++-- newlib/libc/stdio/findfp.c | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h index 95cc55fa9..c75e48125 100644 --- a/newlib/libc/include/stdio.h +++ b/newlib/libc/include/stdio.h @@ -169,11 +169,11 @@ typedef _ssize_t ssize_t; =20 #define stdin _REENT_STDIN(_REENT) #define stdout _REENT_STDOUT(_REENT) -#define stderr (_REENT->_stderr) +#define stderr _REENT_STDERR(_REENT) =20 #define _stdin_r(x) _REENT_STDIN(x) #define _stdout_r(x) _REENT_STDOUT(x) -#define _stderr_r(x) ((x)->_stderr) +#define _stderr_r(x) _REENT_STDERR(x) =20 /* * Functions defined in ANSI C standard. diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/re= ent.h index 652a330cb..c0647cfd9 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -722,6 +722,7 @@ struct _reent #define _REENT_ERRNO(_ptr) ((_ptr)->_errno) #define _REENT_STDIN(_ptr) ((_ptr)->_stdin) #define _REENT_STDOUT(_ptr) ((_ptr)->_stdout) +#define _REENT_STDERR(_ptr) ((_ptr)->_stderr) =20 #define _REENT_INIT_PTR(var) \ { memset((var), 0, sizeof(*(var))); \ diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/st= dio.c index 769b8f1c9..83a60c06b 100644 --- a/newlib/libc/machine/spu/stdio.c +++ b/newlib/libc/machine/spu/stdio.c @@ -73,8 +73,8 @@ __sinit (struct _reent *s) _REENT_STDOUT(s) =3D &s->__sf[1]; _REENT_STDOUT(s)->_fp =3D SPE_STDOUT; =20 - s->_stderr =3D &s->__sf[2]; - s->_stderr->_fp =3D SPE_STDERR; + _REENT_STDERR(s) =3D &s->__sf[2]; + _REENT_STDERR(s)->_fp =3D SPE_STDERR; } =20 void diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 04e3517a7..3c888d03c 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -222,8 +222,8 @@ cleanup_stdio (struct _reent *ptr) CLEANUP_FILE (ptr, _REENT_STDIN(ptr)); if (_REENT_STDOUT(ptr) !=3D &__sf[1]) CLEANUP_FILE (ptr, _REENT_STDOUT(ptr)); - if (ptr->_stderr !=3D &__sf[2]) - CLEANUP_FILE (ptr, ptr->_stderr); + if (_REENT_STDERR(ptr) !=3D &__sf[2]) + CLEANUP_FILE (ptr, _REENT_STDERR(ptr)); } =20 /* --=20 2.35.3