From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 45624 invoked by alias); 31 Jan 2019 10:02:14 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 45616 invoked by uid 89); 31 Jan 2019 10:02:14 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: EUR03-AM5-obe.outbound.protection.outlook.com Received: from mail-eopbgr30062.outbound.protection.outlook.com (HELO EUR03-AM5-obe.outbound.protection.outlook.com) (40.107.3.62) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 31 Jan 2019 10:02:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ERgNbiyS7GqV2NZXr0zSyz/zIU63h33FDf5WIzIVz9I=; b=ZfF7kpAODSyoqpBwpQt5a0xRDIo1pQ8cJ4J7EZQlSNWcG5mjzPDMXhqJsVQhE7tVBOEzmnG+xwJua2u+wAfCvDbScS7h8Ohqbwu4nKoP1+LQX28sKpYcdZFoyT6PZJFdUy4BGd1m5AENzecoM/S/gm5WFJXi5zXumqRK3k68oNg= Received: from DB6PR0802MB2133.eurprd08.prod.outlook.com (10.172.227.22) by DB6PR0802MB2184.eurprd08.prod.outlook.com (10.172.226.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.16; Thu, 31 Jan 2019 10:02:10 +0000 Received: from DB6PR0802MB2133.eurprd08.prod.outlook.com ([fe80::acd7:a958:2aaa:562e]) by DB6PR0802MB2133.eurprd08.prod.outlook.com ([fe80::acd7:a958:2aaa:562e%5]) with mapi id 15.20.1580.017; Thu, 31 Jan 2019 10:02:10 +0000 From: Alan Hayward To: Joel Brobecker CC: "gdb-patches@sourceware.org" , nd Subject: Re: [PATCH] Readline: Cleanup some warnings Date: Thu, 31 Jan 2019 10:02:00 -0000 Message-ID: References: <20190130085716.75179-1-alan.hayward@arm.com> <20190131075907.GA313@adacore.com> In-Reply-To: <20190131075907.GA313@adacore.com> authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 Content-Type: text/plain; charset="us-ascii" Content-ID: <7A43FB6036B43148850558E78A36B6AD@eurprd08.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-IsSubscribed: yes X-SW-Source: 2019-01/txt/msg00618.txt.bz2 > On 31 Jan 2019, at 07:59, Joel Brobecker wrote: >=20 >> (Posted this first to binutils, then was directed back here and >> pointed at the upstream readline. Looking at the upstream >> readline it has already fixed the issues below in the same way. >> Tested by running the gdb testsuite - couldn't see a readline >> specific suite.)=20 >>=20 >> Cleanup the readline warnings that gdb buildbot complains about. >>=20 >> To prevent wcwidth missing declaration warnings, add the SOURCE / >> EXTENSION macros to config.in that have already checked for in >> configure. Use the exact same list as GDB - it seemed sensible >> to add all of them. >>=20 >> Ensure pid is a long before printing as one. Also fix GNU style. >>=20 >> Check the return value of write the same way as history_do_write (). >>=20 >> These changes are consistent with upstream readline. >>=20 >> readline/ChangeLog.gdb: >>=20 >> 2019-01-30 Alan Hayward >>=20 >> * config.h.in: Add SOURCE/EXTENSION macros. >> * histfile.c (history_truncate_file): Check return of write. >> * util.c: Ensure pid is long. >=20 > If it is a backport Technically, not a back port because I wrote the changes then realised they are the same as upstream. Just a quick thought - would it help with future rebasing if I ensured the changes were *exactly* the same? (For example, the config.h.in changes are in a different place in the=20 file with different comments). > from mainline readline, and you've run > the testsuite (readline is being necessarily extensively covered, > but at least it is used implicitly, since it provides the framework > for the interactive prompt, which is being driven via expect/tcl), > it's OK to push. >=20 > Just one question: Any reason you didn't list the name of the function > being modified, in the change to util.c? Missed that! >=20 >> --- >> readline/config.h.in | 21 +++++++++++++++++++++ >> readline/histfile.c | 3 ++- >> readline/util.c | 6 +++--- >> 3 files changed, 26 insertions(+), 4 deletions(-) >>=20 >> diff --git a/readline/config.h.in b/readline/config.h.in >> index 86d86cfa3d..81575f43f7 100644 >> --- a/readline/config.h.in >> +++ b/readline/config.h.in >> @@ -271,3 +271,24 @@ >> # define USE_VARARGS >> # endif >> #endif >> + >> +/* Enable extensions on AIX 3, Interix. */ >> +#ifndef _ALL_SOURCE >> +# undef _ALL_SOURCE >> +#endif >> +/* Enable GNU extensions on systems that have them. */ >> +#ifndef _GNU_SOURCE >> +# undef _GNU_SOURCE >> +#endif >> +/* Enable threading extensions on Solaris. */ >> +#ifndef _POSIX_PTHREAD_SEMANTICS >> +# undef _POSIX_PTHREAD_SEMANTICS >> +#endif >> +/* Enable extensions on HP NonStop. */ >> +#ifndef _TANDEM_SOURCE >> +# undef _TANDEM_SOURCE >> +#endif >> +/* Enable general extensions on Solaris. */ >> +#ifndef __EXTENSIONS__ >> +# undef __EXTENSIONS__ >> +#endif >> diff --git a/readline/histfile.c b/readline/histfile.c >> index fffeb3fd31..56cbbf0498 100644 >> --- a/readline/histfile.c >> +++ b/readline/histfile.c >> @@ -407,7 +407,8 @@ history_truncate_file (fname, lines) >> truncate to. */ >> if (bp > buffer && ((file =3D open (filename, O_WRONLY|O_TRUNC|O_BINAR= Y, 0600)) !=3D -1)) >> { >> - write (file, bp, chars_read - (bp - buffer)); >> + if (write (file, bp, chars_read - (bp - buffer)) < 0) >> + rv =3D errno; >>=20 >> #if defined (__BEOS__) >> /* BeOS ignores O_TRUNC. */ >> diff --git a/readline/util.c b/readline/util.c >> index d402fce842..13bd00c09c 100644 >> --- a/readline/util.c >> +++ b/readline/util.c >> @@ -515,11 +515,11 @@ _rl_tropen () >> (sh_get_env_value ("TEMP") >> ? sh_get_env_value ("TEMP") >> : "."), >> - getpid()); >> + getpid ()); >> #else >> - sprintf (fnbuf, "/var/tmp/rltrace.%ld", getpid()); >> + sprintf (fnbuf, "/var/tmp/rltrace.%ld", (long) getpid ()); >> #endif >> - unlink(fnbuf); >> + unlink (fnbuf); >> _rl_tracefp =3D fopen (fnbuf, "w+"); >> return _rl_tracefp !=3D 0; >> } >> --=20 >> 2.17.2 (Apple Git-113) >=20 > --=20 > Joel