From patchwork Thu Sep 6 21:13:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 29228 Received: (qmail 117195 invoked by alias); 6 Sep 2018 21:14:30 -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 117164 invoked by uid 89); 6 Sep 2018 21:14:29 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, 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: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.49.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 06 Sep 2018 21:14:28 +0000 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 454A91293E for ; Thu, 6 Sep 2018 16:13:24 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id y1aTfYHcwBcCXy1aZf0KjE; Thu, 06 Sep 2018 16:13:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6NxZtzSRBd6UmxjaIYLLN5DhbjS4tCpIj4cTgA8DpaU=; b=ABaL+T5oeryYPfYmZORwid3zpj K4cnxhhTPgUUWMDWn15cOBSZ/cAjnZkkaOLpxfiSd78OjnmmHLlGVZ/rBkaiFEP9gvHQlGB1X+JsN 1HL5vb+XL9GSG0kZkdA0C/n7p; Received: from 75-166-85-72.hlrn.qwest.net ([75.166.85.72]:34550 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fy1aT-0013U4-7j; Thu, 06 Sep 2018 16:13:13 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 5/8] Style locations when setting a breakpoint Date: Thu, 6 Sep 2018 15:13:00 -0600 Message-Id: <20180906211303.11029-6-tom@tromey.com> In-Reply-To: <20180906211303.11029-1-tom@tromey.com> References: <20180906211303.11029-1-tom@tromey.com> say_where does not use ui-out, so function and file names printed by it were not styled. This patch changes say_where to use the low-level style code directly. --- gdb/breakpoint.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 4e7dac51574..62824351ed6 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -68,6 +68,7 @@ #include "format.h" #include "thread-fsm.h" #include "tid-parse.h" +#include "cli/cli-style.h" /* readline include files */ #include "readline/readline.h" @@ -12203,9 +12204,14 @@ say_where (struct breakpoint *b) /* If there is a single location, we can print the location more nicely. */ if (b->loc->next == NULL) - printf_filtered (": file %s, line %d.", - symtab_to_filename_for_display (b->loc->symtab), - b->loc->line_number); + { + puts_filtered (": file "); + set_output_style (gdb_stdout, file_name_style.style ()); + puts_filtered (symtab_to_filename_for_display (b->loc->symtab)); + set_output_style (gdb_stdout, ui_file_style ()); + printf_filtered (", line %d.", + b->loc->line_number); + } else /* This is not ideal, but each location may have a different file name, and this at least reflects the