From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id rU8NNKuAa2SgKREAWB0awg (envelope-from ) for ; Mon, 22 May 2023 10:48:11 -0400 Received: by simark.ca (Postfix, from userid 112) id B7F451E11E; Mon, 22 May 2023 10:48:11 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=KqD+8m9w; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 4BECB1E111 for ; Mon, 22 May 2023 10:48:11 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 351F23858418 for ; Mon, 22 May 2023 14:48:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 351F23858418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684766888; bh=RmwJivqiABViXUrU11Jf0zuh1qPuF9n8gWhbePKfRYg=; h=Date:Subject:To:Cc:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=KqD+8m9wQiriDdUuODfMZynb223rZQG/HGrpZCoUk1FPm+9HuAq+MS9KdTZZ1Hf4d Cey8UFhcCM8bzh4wPTYmB4aYsMHR0gHa7axaiZl8yQoAUKGnSyEK1TTPQsIUC4g+LO os5RzEkUD4XfCjW8g4i2qLPT1dHKeuJnb6ARY/sg= Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id C6ECF3858430 for ; Mon, 22 May 2023 14:47:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C6ECF3858430 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 053A41FF7C; Mon, 22 May 2023 14:47:48 +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 E418B13776; Mon, 22 May 2023 14:47:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id HLeVNpOAa2TkKgAAMHmgww (envelope-from ); Mon, 22 May 2023 14:47:47 +0000 Content-Type: multipart/mixed; boundary="------------mfeJxyGnltKwLjzWyFW1YAUh" Message-ID: Date: Mon, 22 May 2023 16:47:50 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: [pushed] [gdb/tui] Fix buglet in tui_update_variables Content-Language: en-US To: gdb-patches@sourceware.org Cc: Tom Tromey References: <20230508141036.22723-1-tdevries@suse.de> <20230508141036.22723-3-tdevries@suse.de> In-Reply-To: <20230508141036.22723-3-tdevries@suse.de> 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: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" This is a multi-part message in MIME format. --------------mfeJxyGnltKwLjzWyFW1YAUh Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit [ was: Re: [PATCH 2/3] [gdb/tui] Fix buglet in set_border_kind_item ] On 5/8/23 16:10, Tom de Vries via Gdb-patches wrote: > 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. > I'm not sure if the enhancement "border-kind active-ascii" will make it, so I've ported this fix to trunk and committed. Thanks, - Tom --------------mfeJxyGnltKwLjzWyFW1YAUh Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-tui-Fix-buglet-in-tui_update_variables.patch" Content-Disposition: attachment; filename="0001-gdb-tui-Fix-buglet-in-tui_update_variables.patch" Content-Transfer-Encoding: base64 RnJvbSBjZDFlZDFmZDJlOGNjZWMzNDAwOGQwM2E5YjI1MTMyZjRlYjNiZjY0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gZGUgVnJpZXMgPHRkZXZyaWVzQHN1c2UuZGU+ CkRhdGU6IE1vbiwgOCBNYXkgMjAyMyAxMzoyNDowOCArMDIwMApTdWJqZWN0OiBbcHVzaGVk XSBbZ2RiL3R1aV0gRml4IGJ1Z2xldCBpbiB0dWlfdXBkYXRlX3ZhcmlhYmxlcwoKSSBub3Rp Y2VkIGEgYnVnbGV0IGluIHR1aV91cGRhdGVfdmFyaWFibGVzOgouLi4KICAgZW50cnkgPSB0 cmFuc2xhdGUgKHR1aV9ib3JkZXJfa2luZCwgdHVpX2JvcmRlcl9raW5kX3RyYW5zbGF0ZV9s cmNvcm5lcik7CiAgIGlmICh0dWlfYm9yZGVyX2xyY29ybmVyICE9IChjaHR5cGUpIGVudHJ5 LT52YWx1ZSkKICAgIHsKICAgICAgdHVpX2JvcmRlcl9scmNvcm5lciA9IChlbnRyeS0+dmFs dWUgPCAwKSA/IEFDU19MUkNPUk5FUiA6IGVudHJ5LT52YWx1ZTsKLi4uCgpXaGVuIGFzc2ln bmluZyB0aGUgbmV3IHZhbHVlIHRvIHR1aV9ib3JkZXJfbHJjb3JuZXIsIGFuIGVudHJ5LT52 YWx1ZSBvZiAtMSBpcwp0YWtlbiBpbnRvIGFjY291bnQsIGJ1dCBub3Qgd2hlbiBjb21wYXJp bmcgdG8gdGhlIGN1cnJlbnQgdmFsdWUgb2YKdHVpX2JvcmRlcl9scmNvcm5lci4KCkZpeCB0 aGlzIGJ5IGludHJvZHVjaW5nOgouLi4KICBpbnQgdmFsID0gKGVudHJ5LT52YWx1ZSA8IDAp ID8gQUNTX0xSQ09STkVSIDogZW50cnktPnZhbHVlOwouLi4KYW5kIHVzaW5nIHRoaXMgaW4g Ym90aCBjb21wYXJpc29uIGFuZCBhc3NpZ25tZW50LgoKVGVzdGVkIG9uIHg4Nl82NC1saW51 eC4KLS0tCiBnZGIvdHVpL3R1aS13aW4uYyB8IDUgKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAz IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ2RiL3R1aS90 dWktd2luLmMgYi9nZGIvdHVpL3R1aS13aW4uYwppbmRleCA2NzEwYjNlMTdlNS4uN2FiZDFl MjI1YjkgMTAwNjQ0Ci0tLSBhL2dkYi90dWkvdHVpLXdpbi5jCisrKyBiL2dkYi90dWkvdHVp LXdpbi5jCkBAIC0zMDAsOSArMzAwLDEwIEBAIHR1aV91cGRhdGVfdmFyaWFibGVzICgpCiAg ICAgIE9ubHkgY2hlY2sgdGhlIGZpcnN0IG9uZS4gIFRoZSBBQ1MgY2hhcmFjdGVycyBhcmUg ZGV0ZXJtaW5lZCBhdAogICAgICBydW4gdGltZSBieSBjdXJzZXMgdGVybWluYWwgbWFuYWdl bWVudC4gICovCiAgIGVudHJ5ID0gdHJhbnNsYXRlICh0dWlfYm9yZGVyX2tpbmQsIHR1aV9i b3JkZXJfa2luZF90cmFuc2xhdGVfbHJjb3JuZXIpOwotICBpZiAodHVpX2JvcmRlcl9scmNv cm5lciAhPSAoY2h0eXBlKSBlbnRyeS0+dmFsdWUpCisgIGludCB2YWwgPSAoZW50cnktPnZh bHVlIDwgMCkgPyBBQ1NfTFJDT1JORVIgOiBlbnRyeS0+dmFsdWU7CisgIGlmICh0dWlfYm9y ZGVyX2xyY29ybmVyICE9IChjaHR5cGUpIHZhbCkKICAgICB7Ci0gICAgICB0dWlfYm9yZGVy X2xyY29ybmVyID0gKGVudHJ5LT52YWx1ZSA8IDApID8gQUNTX0xSQ09STkVSIDogZW50cnkt PnZhbHVlOworICAgICAgdHVpX2JvcmRlcl9scmNvcm5lciA9IHZhbDsKICAgICAgIG5lZWRf cmVkcmF3ID0gdHJ1ZTsKICAgICB9CiAgIGVudHJ5ID0gdHJhbnNsYXRlICh0dWlfYm9yZGVy X2tpbmQsIHR1aV9ib3JkZXJfa2luZF90cmFuc2xhdGVfbGxjb3JuZXIpOwoKYmFzZS1jb21t aXQ6IDdhOGE2ZjU3ZWNlZDlhOGMyN2E5M2NiNWM1OTc3YTMzYmU3YjFmNzIKLS0gCjIuMzUu MwoK --------------mfeJxyGnltKwLjzWyFW1YAUh--