From patchwork Sun Apr 16 18:48:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67798 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 673B63858D38 for ; Sun, 16 Apr 2023 18:48:57 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from outbound-ss-820.bluehost.com (outbound-ss-820.bluehost.com [69.89.24.241]) by sourceware.org (Postfix) with ESMTPS id 05B8B3858D1E for ; Sun, 16 Apr 2023 18:48:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 05B8B3858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway2.mail.pro1.eigbox.com (Postfix) with ESMTP id 3DCB310047F93 for ; Sun, 16 Apr 2023 18:48:43 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id o7QZpr15Hj9Sgo7QZpphAa; Sun, 16 Apr 2023 18:48:43 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=LP+j/La9 c=1 sm=1 tr=0 ts=643c430b a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=dKHAf1wccvYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=fDW0qNiFNKLqTAlHwbMA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=slnGnMYeIhnhWR6a4Sz/XNwqRa85rn/huh7msO2NM5Q=; b=wItF4NLcwu/VWr9wdUe4blkLkC E9Z7C2UtszanPYWO4prztL5vVkAOVytV/1QqGNs+tl4LakiAJQ0xui8wv/afWo3nYNgrcD4gymSPQ RITfigxNKiJf8o44Bq3XTeFOG; Received: from 71-211-191-82.hlrn.qwest.net ([71.211.191.82]:59786 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1po7QZ-004ASL-1k; Sun, 16 Apr 2023 12:48:43 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Remove error_stream Date: Sun, 16 Apr 2023 12:48:33 -0600 Message-Id: <20230416184833.391586-1-tom@tromey.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.191.82 X-Source-L: No X-Exim-ID: 1po7QZ-004ASL-1k X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-191-82.hlrn.qwest.net (localhost.localdomain) [71.211.191.82]:59786 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3026.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" error_stream is trivial and only used in a couple of spots in breakpoint.c. This patch removes it in favor of just writing it out at the spots where it was used. --- gdb/breakpoint.c | 4 ++-- gdb/utils.c | 6 ------ gdb/utils.h | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 46287da5f87..baf49e4461f 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -3137,7 +3137,7 @@ update_inserted_breakpoint_locations (void) if (error_flag) { target_terminal::ours_for_output (); - error_stream (tmp_error_stream); + error (("%s"), tmp_error_stream.c_str ()); } } @@ -3234,7 +3234,7 @@ insert_breakpoint_locations (void) You may have requested too many hardware breakpoints/watchpoints.\n"); } target_terminal::ours_for_output (); - error_stream (tmp_error_stream); + error (("%s"), tmp_error_stream.c_str ()); } } diff --git a/gdb/utils.c b/gdb/utils.c index 6ec1cc0d48d..f82ee2481fd 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -165,12 +165,6 @@ verror (const char *string, va_list args) throw_verror (GENERIC_ERROR, string, args); } -void -error_stream (const string_file &stream) -{ - error (("%s"), stream.c_str ()); -} - /* Emit a message and abort. */ static void ATTRIBUTE_NORETURN diff --git a/gdb/utils.h b/gdb/utils.h index a383036bcfe..39d1a3bdbff 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -285,8 +285,6 @@ extern void (*deprecated_error_begin_hook) (void); extern const char *warning_pre_print; -extern void error_stream (const string_file &) ATTRIBUTE_NORETURN; - extern void demangler_vwarning (const char *file, int line, const char *, va_list ap) ATTRIBUTE_PRINTF (3, 0);