From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4309 invoked by alias); 22 Sep 2009 22:49:49 -0000 Received: (qmail 4297 invoked by uid 22791); 22 Sep 2009 22:49:48 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 22 Sep 2009 22:49:44 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id E22122BABB6; Tue, 22 Sep 2009 18:49:42 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id feCtzvBdnOqH; Tue, 22 Sep 2009 18:49:42 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 863322BAB9A; Tue, 22 Sep 2009 18:49:42 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id 2DB17F593C; Tue, 22 Sep 2009 15:49:26 -0700 (PDT) Date: Tue, 22 Sep 2009 22:49:00 -0000 From: Joel Brobecker To: Marc Khouzam Cc: gdb-patches@sourceware.org Subject: [RFA/commit] s/nquery/query/ in record.c (was "Re: Another proposal for frontends and queries.") Message-ID: <20090922224925.GH8910@adacore.com> References: <20090916214051.GF8910@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b8GWCKCLzrXbuNet" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) 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 X-SW-Source: 2009-09/txt/msg00719.txt.bz2 --b8GWCKCLzrXbuNet Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 573 It seems that the discussion regarding a short-term fix has died, so I'm assuming that Hui is OK for now with changing nquery to query. Here is a patch that I tested on x86_64-linux, no regression. Will commit in the head and 7.0 branches in a couple of days pending objections. MarcK, did you write a patch like this one, a while ago. You should get credit for it if you did. 2009-09-22 Joel Brobecker * record.c (record_open, record_store_registers, record_xfer_partial): Replace calls to nquery by calls to query. -- Joel --b8GWCKCLzrXbuNet Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="record.diff" Content-length: 2448 commit c27c19686fafd2850ca2401280cf043ecbb60c48 Author: Joel Brobecker Date: Tue Sep 22 15:03:52 2009 -0700 * record.c (record_open, record_store_registers, record_xfer_partial): Replace calls to nquery by calls to query. diff --git a/gdb/record.c b/gdb/record.c index 8ad5bf8..c675e34 100644 --- a/gdb/record.c +++ b/gdb/record.c @@ -497,7 +497,7 @@ record_open (char *name, int from_tty) /* Check if record target is already running. */ if (current_target.to_stratum == record_stratum) { - if (!nquery + if (!query (_("Process record target already running, do you want to delete " "the old record log?"))) return; @@ -1029,15 +1029,15 @@ record_store_registers (struct target_ops *ops, struct regcache *regcache, /* Let user choose if he wants to write register or not. */ if (regno < 0) n = - nquery (_("Because GDB is in replay mode, changing the " - "value of a register will make the execution " - "log unusable from this point onward. " - "Change all registers?")); + query (_("Because GDB is in replay mode, changing the " + "value of a register will make the execution " + "log unusable from this point onward. " + "Change all registers?")); else n = - nquery (_("Because GDB is in replay mode, changing the value " - "of a register will make the execution log unusable " - "from this point onward. Change register %s?"), + query (_("Because GDB is in replay mode, changing the value " + "of a register will make the execution log unusable " + "from this point onward. Change register %s?"), gdbarch_register_name (get_regcache_arch (regcache), regno)); @@ -1085,9 +1085,9 @@ record_xfer_partial (struct target_ops *ops, enum target_object object, if (RECORD_IS_REPLAY) { /* Let user choose if he wants to write memory or not. */ - if (!nquery (_("Because GDB is in replay mode, writing to memory " - "will make the execution log unusable from this " - "point onward. Write memory at address %s?"), + if (!query (_("Because GDB is in replay mode, writing to memory " + "will make the execution log unusable from this " + "point onward. Write memory at address %s?"), paddress (target_gdbarch, offset))) error (_("Process record canceled the operation.")); --b8GWCKCLzrXbuNet--