From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4552 invoked by alias); 6 Sep 2013 12:29:42 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 4509 invoked by uid 89); 6 Sep 2013 12:29:41 -0000 Received: from mms1.broadcom.com (HELO mms1.broadcom.com) (216.31.210.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 06 Sep 2013 12:29:41 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL,BAYES_00,RDNS_NONE autolearn=no version=3.3.2 X-HELO: mms1.broadcom.com Received: from [10.9.208.57] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Fri, 06 Sep 2013 05:25:30 -0700 X-Server-Uuid: 06151B78-6688-425E-9DE2-57CB27892261 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.1.438.0; Fri, 6 Sep 2013 05:29:26 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.1.438.0; Fri, 6 Sep 2013 05:29:26 -0700 Received: from [10.177.73.74] (unknown [10.177.73.74]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 974B41A46 for ; Fri, 6 Sep 2013 05:29:25 -0700 (PDT) Message-ID: <5229CAA4.4090709@broadcom.com> Date: Fri, 06 Sep 2013 12:29:00 -0000 From: "Andrew Burgess" User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: "gdb-patches@sourceware.org" Subject: [PATCH] Remove use of deprecated_init_ui_hook from quit_confirm. Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2013-09/txt/msg00224.txt.bz2 There are only two places that deprecated_init_ui_hook is set (to !NULL) that I can find: 1. In gdbtk, deprecated_init_ui_hook is used to grab a copy of argv0, but is then immediately set back to NULL, and 2. In windows-nat.c, deprecated_init_ui_hook is used to solve an order of initialisation problem when creating a command alias, in this case deprecated_init_ui_hook is left set. In top.c:quit_confirm we check deprecated_init_ui_hook to detect if there's a GUI running. For (1) above this will not kick in, but for (2) it does.... however... I don't see why this is a good thing, as I understand it the windows-nat.c code is not a GUI frontend for gdb, but is just "running-gdb-on-windows-hosts". I find it hard to believe that the shorter, less informative, quit message is really desired... but maybe I've missed something. The following patch removes the use of deprecated_init_ui_hook from quit_confirm, the only change I expect from this is that the quit message on windows hosts will fall into line with other hosts. OK to apply? Thanks, Andrew gdb/ChangeLog 2013-09-06 Andrew Burgess * top.c (quit_confirm): Remove use of deprecated_init_ui_hook. diff --git a/gdb/top.c b/gdb/top.c index b3e7d37..d9128a3 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1355,18 +1355,9 @@ quit_confirm (void) stb = mem_fileopen (); old_chain = make_cleanup_ui_file_delete (stb); - /* This is something of a hack. But there's no reliable way to see - if a GUI is running. The `use_windows' variable doesn't cut - it. */ - if (deprecated_init_ui_hook) - fprintf_filtered (stb, _("A debugging session is active.\n" - "Do you still want to close the debugger?")); - else - { - fprintf_filtered (stb, _("A debugging session is active.\n\n")); - iterate_over_inferiors (print_inferior_quit_action, stb); - fprintf_filtered (stb, _("\nQuit anyway? ")); - } + fprintf_filtered (stb, _("A debugging session is active.\n\n")); + iterate_over_inferiors (print_inferior_quit_action, stb); + fprintf_filtered (stb, _("\nQuit anyway? ")); str = ui_file_xstrdup (stb, NULL); make_cleanup (xfree, str);