public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Move finish_print out of value_print_options
@ 2022-06-20 15:16 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2022-06-20 15:16 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5ffa6ca3e553563004bd9d306bef38e2bee6fecc
commit 5ffa6ca3e553563004bd9d306bef38e2bee6fecc
Author: Tom Tromey <tromey@adacore.com>
Date: Mon Jun 6 10:01:40 2022 -0600
Move finish_print out of value_print_options
'finish_print' does not really belong in value_print_options -- this
is consulted only when deciding whether or not to print a value, and
never during the course of printing. This patch removes it from the
structure and makes it a static global in infcmd.c instead.
Tested on x86-64 Fedora 34.
Diff:
---
gdb/infcmd.c | 15 ++++++++++-----
gdb/valprint.c | 1 -
gdb/valprint.h | 3 ---
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 18590259339..17d15534356 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -98,6 +98,11 @@ enum stop_stack_kind stop_stack_dummy;
int stopped_by_random_signal;
+
+/* Whether "finish" should print the value. */
+
+static bool finish_print = true;
+
\f
static void
@@ -1524,17 +1529,17 @@ print_return_value_1 (struct ui_out *uiout, struct return_value_info *rv)
{
if (rv->value != NULL)
{
- struct value_print_options opts;
-
/* Print it. */
uiout->text ("Value returned is ");
uiout->field_fmt ("gdb-result-var", "$%d",
rv->value_history_index);
uiout->text (" = ");
- get_user_print_options (&opts);
- if (opts.finish_print)
+ if (finish_print)
{
+ struct value_print_options opts;
+ get_user_print_options (&opts);
+
string_file stb;
value_print (rv->value, &stb, &opts);
uiout->field_stream ("return-value", stb);
@@ -3351,7 +3356,7 @@ List all available info about the specified process."),
&info_proc_cmdlist);
add_setshow_boolean_cmd ("finish", class_support,
- &user_print_options.finish_print, _("\
+ &finish_print, _("\
Set whether `finish' prints the return value."), _("\
Show whether `finish' prints the return value."), NULL,
NULL,
diff --git a/gdb/valprint.c b/gdb/valprint.c
index e63ec30f4c7..f873e12d0ca 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -121,7 +121,6 @@ struct value_print_options user_print_options =
0, /* summary */
1, /* symbol_print */
PRINT_MAX_DEPTH_DEFAULT, /* max_depth */
- 1 /* finish_print */
};
/* Initialize *OPTS to be a copy of the user print options. */
diff --git a/gdb/valprint.h b/gdb/valprint.h
index d6ad45d7580..2e12eaadf93 100644
--- a/gdb/valprint.h
+++ b/gdb/valprint.h
@@ -103,9 +103,6 @@ struct value_print_options
/* Maximum print depth when printing nested aggregates. */
int max_depth;
-
- /* Whether "finish" should print the value. */
- bool finish_print;
};
/* Create an option_def_group for the value_print options, with OPTS
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-20 15:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-20 15:16 [binutils-gdb] Move finish_print out of value_print_options Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).