Message ID | 20200104183410.17114-15-tom@tromey.com |
---|---|
State | New |
Headers | show
Delivered-To: patches-gcc@linaro.org Received: by 2002:a2e:9793:0:0:0:0:0 with SMTP id y19csp22597803lji; Sat, 4 Jan 2020 10:35:34 -0800 (PST) X-Google-Smtp-Source: APXvYqyFkY1jlg0KfUNUdta5QCnBC0t+85un/Ab5YFDhIgAmDYejplUuHGviPhQ4biKfC8hW31e/ X-Received: by 2002:a9d:53c4:: with SMTP id i4mr96647287oth.48.1578162934309; Sat, 04 Jan 2020 10:35:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578162934; cv=none; d=google.com; s=arc-20160816; b=ZBBN8A2MUZckpIkPL/LuZNx+b28uLeimRv8FGt12STZbWMx1OYk4txhupg+EkIBGIg MRHWQ/GfVFDs/eeF1uD6C4sJTGQGXxpK+rZGfwh7KXQ53oxsjGRJcEGlzKYeDN7fg3tp 4jv+k8P9NNlEtmWbF3LS/+pvEkmlj18FOCFDy/ZG6blwybNv85K2oB3LLFHT6R5u8Tdj tDkPYlrsgOQ9NXHr321SavjSGQj2fjXNjzxx42/hBL5VJfpm73Vxsw+qELK247QPXNyx sz+CGV1i1NfBQ/Gp8XizADHOjdhNG3jT5c9/+UTw6l+R3kewfkBb4dkz35x/ZEq2Aqrq s9tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=2nQIGBQSpRYlexrPPmghAKI2fJwkAK3b6VXgSDYLp3c=; b=iazpH7M8vjRKvhGft23iZHB/n69V4xy4kt3r3gm5YgW91lAxIMsm8eoACrFdff8I1E jj5JFZGIOO+lb7tgEdX9C1w106xR7njdaz1ERFzW21JdVtgwQGCOwcT0gd4B2mvEd75V NwJhF1bC1kCKM4OE9BAqY82CFZ3UGNliGtbW/YfGKtCZC3mieyFjUVoplOVlilIA+Aqe HHKR6bNFp1o7pWfdfvQzJcxhOcWnI6l7IbPPq3PIylPPwvPzjs+Ixe9pI8Z9vYPvnQyk FsikIgJcg10uVeifw/pXmxusBKsyjnRaqcXHX3OU77xtHXJ/Ej8QDMus4g/wVpr6VweZ fYcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Cv9d8jed; dkim=fail header.i=@tromey.com header.s=default header.b=NylgrXRF; spf=pass (google.com: domain of gdb-patches-return-162754-patches-gcc=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gdb-patches-return-162754-patches-gcc=linaro.org@sourceware.org" Return-Path: <gdb-patches-return-162754-patches-gcc=linaro.org@sourceware.org> Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id l19si29504039oii.54.2020.01.04.10.35.33 for <patches-gcc@linaro.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Jan 2020 10:35:34 -0800 (PST) Received-SPF: pass (google.com: domain of gdb-patches-return-162754-patches-gcc=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Cv9d8jed; dkim=fail header.i=@tromey.com header.s=default header.b=NylgrXRF; spf=pass (google.com: domain of gdb-patches-return-162754-patches-gcc=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gdb-patches-return-162754-patches-gcc=linaro.org@sourceware.org" DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=gHEjx7qHSgZusfnQ5Tbw/aiPifj6ZRG a/eGtUGMQ+ZdbcAlDckyNHI/UgN0Q/FjyhszDsfvfWMRSbo0Y76/JO//OV6IokfC hSMNDpo/YqTGr0tqwAf8tmEtdHYQPPTXmy9h/7MGz3yrxejUkwm1jO2S128GMLrg fC/q82Mq9zpA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=IDGThILwNWXJ8bVpd00mBsYqHn4=; b=Cv9d8 jedTJ4G9Qjg3ICpXP4kL6UJTLC6BqKAVy00hXo7gaJDFgdTE5TAUXvKpyRfrecsj rJm9OURimZexArGx7yD8LWNs0eOZAywuL7E7YJJXoDtvhkjlPTagdAn39BF8RXAO RyEGvijYzcXoEt8dF9PQpWYhIDK0HCpq/3SFhw= Received: (qmail 872 invoked by alias); 4 Jan 2020 18:34:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <gdb-patches.sourceware.org> List-Unsubscribe: <mailto:gdb-patches-unsubscribe-patches-gcc=linaro.org@sourceware.org> List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 379 invoked by uid 89); 4 Jan 2020 18:34:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.2 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= X-HELO: gateway30.websitewelcome.com Received: from gateway30.websitewelcome.com (HELO gateway30.websitewelcome.com) (192.185.192.34) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 04 Jan 2020 18:34:17 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway30.websitewelcome.com (Postfix) with ESMTP id D00C92C414 for <gdb-patches@sourceware.org>; Sat, 4 Jan 2020 12:34:15 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id noFbiCiLx3Qi0noFbi0tiN; Sat, 04 Jan 2020 12:34:15 -0600 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=2nQIGBQSpRYlexrPPmghAKI2fJwkAK3b6VXgSDYLp3c=; b=NylgrXRFvm75C8G5yME0x3cqhN RAL2i8nbEayOhGvSuptxW654S7CAOgZ3JuEIlTsyzxxV4bN7y+0ivwB5vkvisaGwxHI0yFEW7l2TY SGEZ2JmHbbaPycoichCz+MEPp; Received: from 75-166-123-50.hlrn.qwest.net ([75.166.123.50]:48942 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from <tom@tromey.com>) id 1inoFb-0026Lh-MR; Sat, 04 Jan 2020 11:34:15 -0700 From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Subject: [PATCH 14/24] Handle ambiguity in tui_partial_win_by_name Date: Sat, 4 Jan 2020 11:34:00 -0700 Message-Id: <20200104183410.17114-15-tom@tromey.com> In-Reply-To: <20200104183410.17114-1-tom@tromey.com> References: <20200104183410.17114-1-tom@tromey.com> |
Series |
|
Related |
show
|
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 8206f3e6965..6eab125d731 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -694,18 +694,27 @@ tui_scroll_right_command (const char *arg, int from_tty) static struct tui_win_info * tui_partial_win_by_name (gdb::string_view name) { + struct tui_win_info *best = nullptr; + if (name != NULL) { for (tui_win_info *item : all_tui_windows ()) { const char *cur_name = item->name (); - if (startswith (cur_name, name)) + if (name == cur_name) return item; + if (startswith (cur_name, name)) + { + if (best != nullptr) + error (_("Window name \"%*s\" is ambiguous"), + (int) name.size (), name.data ()); + best = item; + } } } - return NULL; + return best; } /* Set focus to the window named by 'arg'. */