From patchwork Tue Jan 28 14:28:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ldurfina@tachyum.com X-Patchwork-Id: 37587 Received: (qmail 125774 invoked by alias); 28 Jan 2020 14:28:50 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 125634 invoked by uid 89); 28 Jan 2020 14:28:49 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=H*r:0800, HX-Languages-Length:933 X-HELO: mail.tachyum.com Received: from mail.tachyum.com (HELO mail.tachyum.com) (66.160.133.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 28 Jan 2020 14:28:48 +0000 Received: by mail.tachyum.com (Postfix, from userid 1001) id CA96E86E; Tue, 28 Jan 2020 06:28:50 -0800 (PST) Received: from THQ-IP-EX1.tachyum.com (relayhost.tachyum.com [10.7.1.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.tachyum.com (Postfix) with ESMTPS id 778E5220 for ; Tue, 28 Jan 2020 06:28:50 -0800 (PST) Received: from tachyum-sk-server.tachyum.com (10.7.241.13) by THQ-IP-EX1.tachyum.com (10.7.1.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1779.2; Tue, 28 Jan 2020 06:28:45 -0800 From: Lukas Durfina To: Subject: [PATCH 2/2] gdb: Fix a type of sentinel Date: Tue, 28 Jan 2020 15:28:30 +0100 Message-ID: <20200128142830.89282-2-ldurfina@tachyum.com> In-Reply-To: <20200128142830.89282-1-ldurfina@tachyum.com> References: <20200128142830.89282-1-ldurfina@tachyum.com> MIME-Version: 1.0 --- 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");