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 1B41F3851406 for ; Wed, 11 May 2022 17:55:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1B41F3851406 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 sslproxy06.your-server.de ([78.46.172.3]) by dedi548.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1noqYi-000P3x-KG for newlib@sourceware.org; Wed, 11 May 2022 19:55:36 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy06.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1noqYi-000OWA-Ob for newlib@sourceware.org; Wed, 11 May 2022 19:55:36 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 78DBC48004B for ; Wed, 11 May 2022 19:55:36 +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 ruASq-wv5nxS for ; Wed, 11 May 2022 19:55:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 1606048017C for ; Wed, 11 May 2022 19:55:36 +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 Olwb41ZgnhT8 for ; Wed, 11 May 2022 19:55:36 +0200 (CEST) Received: from [10.10.171.14] (unknown [10.10.171.14]) by mail.embedded-brains.de (Postfix) with ESMTPSA id B48CA4800C8 for ; Wed, 11 May 2022 19:55:35 +0200 (CEST) Message-ID: <416bae8c-7fb1-774b-317a-473a9bf90180@embedded-brains.de> Date: Wed, 11 May 2022 19:55:34 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: [PATCH 09/11] stdio: Replace _fwalk_reent() with _fwalk_sglue() Content-Language: en-US To: newlib@sourceware.org References: <20220510080927.28839-1-matthew.joyce@embedded-brains.de> <20220510080927.28839-10-matthew.joyce@embedded-brains.de> From: Sebastian Huber In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Authenticated-Sender: smtp-embedded@poldinet.de X-Virus-Scanned: Clear (ClamAV 0.103.5/26538/Wed May 11 10:06:03 2022) X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, NICE_REPLY_A, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Wed, 11 May 2022 17:55:39 -0000 On 11/05/2022 17:56, Corinna Vinschen wrote: > On May 10 10:09, Matthew Joyce wrote: >> From: Sebastian Huber >> >> Replaced _fwalk_reent() with _fwalk_sglue(). The change adds an >> extra __sglue object as a parameter, which will allow the passing >> of a global __sglue object separate from the __sglue member of >> struct _reent. The global __sglue object will be added in a >> follow-on patch. >> --- >> newlib/libc/stdio/fcloseall.c | 2 +- >> newlib/libc/stdio/fflush.c | 2 +- >> newlib/libc/stdio/findfp.c | 14 ++++++++++---- >> newlib/libc/stdio/fwalk.c | 15 ++++++++------- >> newlib/libc/stdio/local.h | 3 ++- >> newlib/libc/stdio/refill.c | 4 ++-- >> winsup/cygwin/syscalls.cc | 5 +++-- >> 7 files changed, 27 insertions(+), 18 deletions(-) >> [...] >> diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc >> index 1cecaa017..5bf6d8fc7 100644 >> --- a/winsup/cygwin/syscalls.cc >> +++ b/winsup/cygwin/syscalls.cc >> @@ -3058,7 +3058,8 @@ _cygwin_istext_for_stdio (int fd) >> } >> =20 >> /* internal newlib function */ >> -extern "C" int _fwalk_reent (struct _reent *ptr, int (*function) (str= uct _reent *, FILE *)); >> +extern "C" int _fwalk_sglue (struct _reent *ptr, >> + int (*function) (struct _reent *, FILE *), struct _sglue *); > ^^^^^^ > _glue? In patch 8, Matthew added this: diff --git a/winsup/cygwin/signal.cc b/winsup/cygwin/signal.cc index 9b6c2509d..b7f624cc3 100644 --- a/winsup/cygwin/signal.cc +++ b/winsup/cygwin/signal.cc @@ -22,6 +22,7 @@ details. */ #include "cygheap.h" #include "cygwait.h" #include "posix_timer.h" +#include "../../newlib/libc/stdio/local.h" This seems to work in the cygwin build. Should we remove the local=20 declaration and instead include the local.h header file? --=20 embedded brains GmbH Herr Sebastian HUBER Dornierstr. 4 82178 Puchheim Germany email: sebastian.huber@embedded-brains.de phone: +49-89-18 94 741 - 16 fax: +49-89-18 94 741 - 08 Registergericht: Amtsgericht M=C3=BCnchen Registernummer: HRB 157899 Vertretungsberechtigte Gesch=C3=A4ftsf=C3=BChrer: Peter Rasmussen, Thomas= D=C3=B6rfler Unsere Datenschutzerkl=C3=A4rung finden Sie hier: https://embedded-brains.de/datenschutzerklaerung/