From patchwork Thu Jun 8 09:17:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 70777 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 8B40E3856DE2 for ; Thu, 8 Jun 2023 09:18:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8B40E3856DE2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1686215889; bh=2IlvGcBwuthjs4m69/z5PUVp0te6f2GJ+cNcQWIfwoY=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=TH+i2EXWZa11Wt9XOTZ2XCqC3+6flVbCkQyHlC6+zIdr4dBQo8wI3TzO9y2ATDEWK R5jWNzVDMeSdcxib3MKtUEZU6j+E+TefqSN+tZw5Y8P+sD4eUXkvj8XpBgmEhq3bnv PPthi3meR6XBVgaQ/+WkGJjKXHIfX1ueh0zeK7rI= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 020543857353 for ; Thu, 8 Jun 2023 09:17:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 020543857353 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 20F601FDE1 for ; Thu, 8 Jun 2023 09:17:07 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0F3CD13480 for ; Thu, 8 Jun 2023 09:17:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 2IynApOcgWRyaQAAMHmgww (envelope-from ) for ; Thu, 08 Jun 2023 09:17:07 +0000 To: gdb-patches@sourceware.org Subject: [PATCH v2 2/2] [gdb/tui] Simplify tui_update_variables Date: Thu, 8 Jun 2023 11:17:14 +0200 Message-Id: <20230608091714.19546-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230608091714.19546-1-tdevries@suse.de> References: <20230608091714.19546-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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: , X-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Simplify tui_update_variables by using template function assign_return_if_changed. Tested on x86_64-linux. --- gdb/tui/tui-win.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 71f961e04d2..3e2605ff24a 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -284,28 +284,20 @@ tui_update_variables () struct tui_translate *entry; entry = translate (tui_border_mode, tui_border_mode_translate); - if (tui_border_attrs != entry->value) - { - tui_border_attrs = entry->value; - need_redraw = true; - } + need_redraw + |= assign_return_if_changed (tui_border_attrs, entry->value); + entry = translate (tui_active_border_mode, tui_border_mode_translate); - if (tui_active_border_attrs != entry->value) - { - tui_active_border_attrs = entry->value; - need_redraw = true; - } + need_redraw + |= assign_return_if_changed (tui_active_border_attrs, entry->value); /* If one corner changes, all characters are changed. Only check the first one. The ACS characters are determined at run time by curses terminal management. */ entry = translate (tui_border_kind, tui_border_kind_translate_lrcorner); int val = (entry->value < 0) ? ACS_LRCORNER : entry->value; - if (tui_border_lrcorner != (chtype) val) - { - tui_border_lrcorner = val; - need_redraw = true; - } + need_redraw |= assign_return_if_changed (tui_border_lrcorner, val); + entry = translate (tui_border_kind, tui_border_kind_translate_llcorner); tui_border_llcorner = (entry->value < 0) ? ACS_LLCORNER : entry->value;