From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686215827; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2IlvGcBwuthjs4m69/z5PUVp0te6f2GJ+cNcQWIfwoY=; b=0NX2WGyZOHTQCJSvZ0I1azFtb8+DZXL7/Jry9CIku82wx1s/ixsMrbWVYZLm1eb5Pg01Us ub+OAcdkBU24ZhPxhTTYyPtKj9oiGnO1dWBSjhK2D2docK52kSrw2/dRm1XzIF0uLSbjm1 Mfq2U79YJu3URsjBhAsMofb4ghKNYwE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686215827; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2IlvGcBwuthjs4m69/z5PUVp0te6f2GJ+cNcQWIfwoY=; b=yPzERflVaDKL6As2gPL4wpgB8jWjOPzjnKvT0v7xwGH4Yz6Th/lIPtwb5fkzVWQo987B9I +u8HqoYA9rvfncAQ== 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 From: Tom de Vries 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 Content-Transfer-Encoding: 8bit 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 List-Id: 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; -- 2.35.3