From patchwork Sun Aug 18 17:27:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34166 Received: (qmail 77824 invoked by alias); 18 Aug 2019 17:27:51 -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 77573 invoked by uid 89); 18 Aug 2019 17:27:45 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.7 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.1 spammy=HX-Languages-Length:1916 X-HELO: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.47.80) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 18 Aug 2019 17:27:43 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway23.websitewelcome.com (Postfix) with ESMTP id D441F8421 for ; Sun, 18 Aug 2019 12:27:41 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id zOxxhHyjb2qH7zOxxhGagf; Sun, 18 Aug 2019 12:27:41 -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=ChiafKXHzjFLfsWEhTEm96vqbg+ZUa86eQjSyQwBP7U=; b=aOBjuFC9JytcUiuXR7kk5x7rgI RSdp1Q+te4/NumWc3VlorcZFBcZJib/WN4NqpZoPoxv/WXgm9ncL7YAxlMtYOAHRgSoWV52/hFq9B 4T+TqrHopBkkiYWa9DmFyuzNh; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:44512 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hzOxx-002aYY-Jm; Sun, 18 Aug 2019 12:27:41 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 12/14] Move some defines to tui-stack.c Date: Sun, 18 Aug 2019 11:27:33 -0600 Message-Id: <20190818172735.17477-13-tom@tromey.com> In-Reply-To: <20190818172735.17477-1-tom@tromey.com> References: <20190818172735.17477-1-tom@tromey.com> Some #defines in tui-data.h are only used in tui-stack.c, so move them there. gdb/ChangeLog 2019-08-18 Tom Tromey * tui/tui-data.h (PROC_PREFIX, LINE_PREFIX, PC_PREFIX) (MIN_LINE_WIDTH, MIN_PROC_WIDTH, MAX_TARGET_WIDTH) (MAX_PID_WIDTH): Move to tui-stack.c. * tui/tui-stack.c (PROC_PREFIX, LINE_PREFIX, PC_PREFIX) (MIN_LINE_WIDTH, MIN_PROC_WIDTH, MAX_TARGET_WIDTH) (MAX_PID_WIDTH): Move from tui-data.h. --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-data.h | 11 ----------- gdb/tui/tui-stack.c | 12 ++++++++++++ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index a5ff5e2260e..dda15d1fbe1 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -108,19 +108,8 @@ public: #define MIN_CMD_WIN_HEIGHT 3 /* Strings to display in the TUI status line. */ -#define PROC_PREFIX "In: " -#define LINE_PREFIX "L" -#define PC_PREFIX "PC: " #define SINGLE_KEY "(SingleKey)" -/* Minimum/Maximum length of some fields displayed in the TUI status - line. */ -#define MIN_LINE_WIDTH 4 /* Use at least 4 digits for line - numbers. */ -#define MIN_PROC_WIDTH 12 -#define MAX_TARGET_WIDTH 10 -#define MAX_PID_WIDTH 19 - /* The kinds of layouts available. */ enum tui_layout_type { diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index 001133c7b5e..0d411331bba 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -39,6 +39,18 @@ #include "gdb_curses.h" +#define PROC_PREFIX "In: " +#define LINE_PREFIX "L" +#define PC_PREFIX "PC: " + +/* Minimum/Maximum length of some fields displayed in the TUI status + line. */ +#define MIN_LINE_WIDTH 4 /* Use at least 4 digits for line + numbers. */ +#define MIN_PROC_WIDTH 12 +#define MAX_TARGET_WIDTH 10 +#define MAX_PID_WIDTH 19 + static struct tui_locator_window _locator; /* Get a printable name for the function at the address.