From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 47812 invoked by alias); 28 Jan 2020 16:44:05 -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 47802 invoked by uid 89); 28 Jan 2020 16:44:02 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: simark.ca Received: from simark.ca (HELO simark.ca) (158.69.221.121) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 28 Jan 2020 16:44:01 +0000 Received: from [172.16.0.95] (192-222-181-218.qc.cable.ebox.net [192.222.181.218]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 3F5E61E5F7; Tue, 28 Jan 2020 11:44:00 -0500 (EST) Subject: Re: [PATCH 2/2] gdb: Fix a type of sentinel To: Lukas Durfina , gdb-patches@sourceware.org References: <20200128142830.89282-1-ldurfina@tachyum.com> <20200128142830.89282-2-ldurfina@tachyum.com> From: Simon Marchi Message-ID: <920e08c2-dfc3-bb13-21e7-90635341df77@simark.ca> Date: Tue, 28 Jan 2020 16:53:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200128142830.89282-2-ldurfina@tachyum.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2020-01/txt/msg00905.txt.bz2 On 2020-01-28 9:28 a.m., Lukas Durfina wrote: > --- > gdb/ChangeLog | 4 ++++ > gdb/charset.c | 2 +- > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/gdb/ChangeLog b/gdb/ChangeLog > index 8b6da62bd4..1dd89ae2e0 100644 > --- a/gdb/ChangeLog > +++ b/gdb/ChangeLog > @@ -1,3 +1,7 @@ > +2020-01-28 Lukas Durfina > + > + * charset.c (find_charset_names): Fix a type of sentinel. > + > 2020-01-26 Tom Tromey > > * ctfread.c (struct ctf_fp_info): Reindent. > diff --git a/gdb/charset.c b/gdb/charset.c > index 5cfd2d8030..abf795ce6d 100644 > --- a/gdb/charset.c > +++ b/gdb/charset.c > @@ -818,7 +818,7 @@ find_charset_names (void) > { > std::string iconv_dir = relocate_gdb_directory (ICONV_BIN, > ICONV_BIN_RELOCATABLE); > - iconv_program = concat (iconv_dir.c_str(), SLASH_STRING, "iconv", NULL); > + iconv_program = concat (iconv_dir.c_str(), SLASH_STRING, "iconv", (char *) NULL); > } > #else > iconv_program = xstrdup ("iconv"); > -- > 2.17.1 > Hi Lukas, Same comment as patch 1/2. If this change fixes the same problem as patch 1/2, then you can put both changes in the same patch. Simon