From patchwork Mon May 8 14:10:35 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: 68907 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 E77303854140 for ; Mon, 8 May 2023 14:11:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E77303854140 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683555067; bh=SI3uMXZt+pwAVnsVuWxD41xy2O75vTFDrWxOxeiWv+I=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=IfFsEmTY7QNY8/iI1s2U6dvuBNtFMDchy8zdfKw8JeZ7bfn67McDnc6J75xz1RIeQ S5AnJpKYE+tEkLAiiRZoBInxz/BfpjswtcKhzuY3caCQwZL89aM8y0h8vHlTNwWcyM f4kkERqlN20jlKGq7g93z4VE5hgKroJk/muhdUoc= 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 7C3723858C36 for ; Mon, 8 May 2023 14:10:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7C3723858C36 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 B26F41FF47; Mon, 8 May 2023 14:10:39 +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 62BD21346B; Mon, 8 May 2023 14:10:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uI4EFN8CWWSpAwAAMHmgww (envelope-from ); Mon, 08 May 2023 14:10:39 +0000 To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 2/3] [gdb/tui] Fix buglet in set_border_kind_item Date: Mon, 8 May 2023 16:10:35 +0200 Message-Id: <20230508141036.22723-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230508141036.22723-1-tdevries@suse.de> References: <20230508141036.22723-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 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" While factoring out set_border_kind_item I noticed a buglet: ... struct tui_translate *entry = translate (key, dict); if (*lval != (chtype) entry->value) { *lval = (entry->value < 0) ? acs : entry->value; ... When assigning the new value to *lval, an entry->value of -1 is taken into account, but not when comparing to the current value of *lval. Fix this by introducing: ... int val = (entry->value < 0) ? acs : entry->value; ... and using this in both comparison and assignment. Tested on x86_64-linux. --- gdb/tui/tui-win.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index cf4cb920524..fedcac4b560 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -300,10 +300,11 @@ set_border_kind_item (chtype *lval, const char *key, struct tui_translate *dict, int acs, bool *lval_changed) { struct tui_translate *entry = translate (key, dict); + int val = (entry->value < 0) ? acs : entry->value; - if (*lval != (chtype) entry->value) + if (*lval != (chtype) val) { - *lval = (entry->value < 0) ? acs : entry->value; + *lval = val; *lval_changed = true; } }