[RFA/commit] s/nquery/query/ in record.c (was "Re: Another proposal for frontends and queries.")

Joel Brobecker
2009-09-22T22:49:49Z

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

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 <brobecker@adacore.com>

* record.c (record_open, record_store_registers, record_xfer_partial):
Replace calls to nquery by calls to query.

--
Joel

[-- Attachment #2: record.diff --]
[-- Type: text/x-diff, Size: 2448 bytes --]

commit c27c19686fafd2850ca2401280cf043ecbb60c48
Author: Joel Brobecker <brobecker@adacore.com>
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."));