aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/ChangeLog33
-rw-r--r--gdb/NEWS5
-rw-r--r--gdb/ada-valprint.c48
-rw-r--r--gdb/cp-valprint.c51
-rw-r--r--gdb/doc/ChangeLog5
-rw-r--r--gdb/doc/gdb.texinfo25
-rw-r--r--gdb/jv-valprint.c41
-rw-r--r--gdb/m2-lang.c17
-rw-r--r--gdb/main.c1
-rw-r--r--gdb/objc-lang.c17
-rw-r--r--gdb/p-lang.c17
-rw-r--r--gdb/p-valprint.c41
-rw-r--r--gdb/printcmd.c30
-rw-r--r--gdb/top.c2
-rw-r--r--gdb/top.h1
-rw-r--r--gdb/valprint.c13
-rw-r--r--gdb/valprint.h10
17 files changed, 109 insertions, 248 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 69b71f5..ae086e5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,34 @@
+2013-01-07 Tom Tromey <tromey@redhat.com>
+
+ PR cli/7719:
+ * NEWS: Update.
+ * ada-valprint.c (printstr, print_field_values): Remove
+ "inspect_it" code.
+ * cp-valprint.c (cp_print_value_fields): Remove "inspect_it"
+ code.
+ * jv-valprint.c (java_print_value_fields): Remove "inspect_it"
+ code.
+ * m2-lang.c (m2_printstr): Remove "inspect_it" code.
+ * main.c (captured_main): Remove "epoch" argument.
+ * objc-lang.c (objc_printstr): Remove "inspect_it" code.
+ * p-lang.c (pascal_printstr): Remove "inspect_it" code.
+ * p-valprint.c (pascal_object_print_value_fields): Remove
+ "inspect_it" code.
+ * printcmd.c (print_command_1): Remove 'inspect' argument.
+ (print_command, call_command): Update.
+ (inspect_command): Remove.
+ (_initialize_printcmd): Make "inspect" an alias for "print".
+ * top.c (epoch_interface): Remove.
+ * top.h (epoch_interface): Remove.
+ * valprint.c (user_print_options): Update.
+ (print_converted_chars_to_obstack): Remove "inspect_it" code.
+ * valprint.h (struct value_print_options) <inspect_it>: Remove
+ field.
+
+2013-01-04 Tom Tromey <tromey@redhat.com>
+
+ * valprint.h (read_string): Add 'extern'.
+
2013-01-07 Joel Brobecker <brobecker@adacore.com>
* darwin-nat.c: Fix typo in TASK_DYLD_INFO_COUNT macro test
@@ -62,7 +93,7 @@
Update year range in copyright notice of all files.
-2013-01-01 Joel Brobecker <brobecker@adacore.com>
+2013-01-01, 13 Joel Brobecker <brobecker@adacore.com>
* top.c (print_gdb_version): Update copyright year.
diff --git a/gdb/NEWS b/gdb/NEWS
index 75a2119..36bbd12 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -19,6 +19,11 @@ Lynx 178 PowerPC powerpc-*-lynx*178
-nh Disables auto-loading of ~/.gdbinit, but still executes all the
other initialization files, unlike -nx which disables all of them.
+* Removed command line options
+
+-epoch This was used by the gdb mode in Epoch, an ancient fork of
+ Emacs.
+
* The 'ptype' and 'whatis' commands now accept an argument to control
type formatting.
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 51fa4a8..836123f 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -509,10 +509,7 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
{
if (in_quotes)
{
- if (options->inspect_it)
- fputs_filtered ("\\\", ", stream);
- else
- fputs_filtered ("\", ", stream);
+ fputs_filtered ("\", ", stream);
in_quotes = 0;
}
fputs_filtered ("'", stream);
@@ -528,10 +525,7 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
{
if (!in_quotes)
{
- if (options->inspect_it)
- fputs_filtered ("\\\"", stream);
- else
- fputs_filtered ("\"", stream);
+ fputs_filtered ("\"", stream);
in_quotes = 1;
}
ada_emit_char (char_at (string, i, type_len, byte_order),
@@ -542,12 +536,7 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
/* Terminate the quotes if necessary. */
if (in_quotes)
- {
- if (options->inspect_it)
- fputs_filtered ("\\\"", stream);
- else
- fputs_filtered ("\"", stream);
- }
+ fputs_filtered ("\"", stream);
if (force_ellipses || i < length)
fputs_filtered ("...", stream);
@@ -1089,29 +1078,14 @@ print_field_values (struct type *type, const gdb_byte *valaddr,
{
wrap_here (n_spaces (2 + 2 * recurse));
}
- if (options->inspect_it)
- {
- if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
- fputs_filtered ("\"( ptr \"", stream);
- else
- fputs_filtered ("\"( nodef \"", stream);
- fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
- language_cplus, DMGL_NO_OPTS);
- fputs_filtered ("\" \"", stream);
- fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
- language_cplus, DMGL_NO_OPTS);
- fputs_filtered ("\") \"", stream);
- }
- else
- {
- annotate_field_begin (TYPE_FIELD_TYPE (type, i));
- fprintf_filtered (stream, "%.*s",
- ada_name_prefix_len (TYPE_FIELD_NAME (type, i)),
- TYPE_FIELD_NAME (type, i));
- annotate_field_name_end ();
- fputs_filtered (" => ", stream);
- annotate_field_value ();
- }
+
+ annotate_field_begin (TYPE_FIELD_TYPE (type, i));
+ fprintf_filtered (stream, "%.*s",
+ ada_name_prefix_len (TYPE_FIELD_NAME (type, i)),
+ TYPE_FIELD_NAME (type, i));
+ annotate_field_name_end ();
+ fputs_filtered (" => ", stream);
+ annotate_field_value ();
if (TYPE_FIELD_PACKED (type, i))
{
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 23f47cd..9a8b4d3 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -259,42 +259,21 @@ cp_print_value_fields (struct type *type, struct type *real_type,
{
wrap_here (n_spaces (2 + 2 * recurse));
}
- if (options->inspect_it)
- {
- if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
- fputs_filtered ("\"( ptr \"", stream);
- else
- fputs_filtered ("\"( nodef \"", stream);
- if (field_is_static (&TYPE_FIELD (type, i)))
- fputs_filtered ("static ", stream);
- fprintf_symbol_filtered (stream,
- TYPE_FIELD_NAME (type, i),
- current_language->la_language,
- DMGL_PARAMS | DMGL_ANSI);
- fputs_filtered ("\" \"", stream);
- fprintf_symbol_filtered (stream,
- TYPE_FIELD_NAME (type, i),
- current_language->la_language,
- DMGL_PARAMS | DMGL_ANSI);
- fputs_filtered ("\") \"", stream);
- }
- else
- {
- annotate_field_begin (TYPE_FIELD_TYPE (type, i));
-
- if (field_is_static (&TYPE_FIELD (type, i)))
- fputs_filtered ("static ", stream);
- fprintf_symbol_filtered (stream,
- TYPE_FIELD_NAME (type, i),
- current_language->la_language,
- DMGL_PARAMS | DMGL_ANSI);
- annotate_field_name_end ();
- /* Do not print leading '=' in case of anonymous
- unions. */
- if (strcmp (TYPE_FIELD_NAME (type, i), ""))
- fputs_filtered (" = ", stream);
- annotate_field_value ();
- }
+
+ annotate_field_begin (TYPE_FIELD_TYPE (type, i));
+
+ if (field_is_static (&TYPE_FIELD (type, i)))
+ fputs_filtered ("static ", stream);
+ fprintf_symbol_filtered (stream,
+ TYPE_FIELD_NAME (type, i),
+ current_language->la_language,
+ DMGL_PARAMS | DMGL_ANSI);
+ annotate_field_name_end ();
+ /* Do not print leading '=' in case of anonymous
+ unions. */
+ if (strcmp (TYPE_FIELD_NAME (type, i), ""))
+ fputs_filtered (" = ", stream);
+ annotate_field_value ();
if (!field_is_static (&TYPE_FIELD (type, i))
&& TYPE_FIELD_PACKED (type, i))
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 801f21d..0eb574d 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-07 Tom Tromey <tromey@redhat.com>
+
+ * gdb.texinfo (Mode Options): Don't mention -epoch.
+ (Data, Emacs): Remove obsolete comments.
+
2013-01-02 Tom Tromey <tromey@redhat.com>
* gdb.texinfo (GDB/MI Output Records): Update menu.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index dbd0c77..f973263 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -1178,13 +1178,6 @@ and a newline. The Emacs-to-@value{GDBN} interface program uses the two
@samp{\032} characters as a signal to display the source code for the
frame.
-@item -epoch
-@cindex @code{--epoch}
-The Epoch Emacs-@value{GDBN} interface sets this option when it runs
-@value{GDBN} as a subprocess. It tells @value{GDBN} to modify its print
-routines so as to allow Epoch to display values of expressions in a
-separate window.
-
@item -annotate @var{level}
@cindex @code{--annotate}
This option sets the @dfn{annotation level} inside @value{GDBN}. Its
@@ -7390,9 +7383,6 @@ instruction.
@cindex examining data
@kindex print
@kindex inspect
-@c "inspect" is not quite a synonym if you are using Epoch, which we do not
-@c document because it is nonstandard... Under Epoch it displays in a
-@c different window or something like that.
The usual way to examine data in your program is with the @code{print}
command (abbreviated @code{p}), or its synonym @code{inspect}. It
evaluates and prints the value of an expression of the language your
@@ -27102,21 +27092,6 @@ A more detailed description of Emacs' interaction with @value{GDBN} is
given in the Emacs manual (@pxref{Debuggers,,, Emacs, The @sc{gnu}
Emacs Manual}).
-@c The following dropped because Epoch is nonstandard. Reactivate
-@c if/when v19 does something similar. ---doc@cygnus.com 19dec1990
-@ignore
-@kindex Emacs Epoch environment
-@kindex Epoch
-@kindex inspect
-
-Version 18 of @sc{gnu} Emacs has a built-in window system
-called the @code{epoch}
-environment. Users of this environment can use a new command,
-@code{inspect} which performs identically to @code{print} except that
-each value is printed in its own window.
-@end ignore
-
-
@node GDB/MI
@chapter The @sc{gdb/mi} Interface
diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index d9e32ba..619aa3f 100644
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -361,36 +361,17 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr,
{
wrap_here (n_spaces (2 + 2 * recurse));
}
- if (options->inspect_it)
- {
- if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
- fputs_filtered ("\"( ptr \"", stream);
- else
- fputs_filtered ("\"( nodef \"", stream);
- if (field_is_static (&TYPE_FIELD (type, i)))
- fputs_filtered ("static ", stream);
- fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
- language_cplus,
- DMGL_PARAMS | DMGL_ANSI);
- fputs_filtered ("\" \"", stream);
- fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
- language_cplus,
- DMGL_PARAMS | DMGL_ANSI);
- fputs_filtered ("\") \"", stream);
- }
- else
- {
- annotate_field_begin (TYPE_FIELD_TYPE (type, i));
-
- if (field_is_static (&TYPE_FIELD (type, i)))
- fputs_filtered ("static ", stream);
- fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
- language_cplus,
- DMGL_PARAMS | DMGL_ANSI);
- annotate_field_name_end ();
- fputs_filtered (": ", stream);
- annotate_field_value ();
- }
+
+ annotate_field_begin (TYPE_FIELD_TYPE (type, i));
+
+ if (field_is_static (&TYPE_FIELD (type, i)))
+ fputs_filtered ("static ", stream);
+ fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
+ language_cplus,
+ DMGL_PARAMS | DMGL_ANSI);
+ annotate_field_name_end ();
+ fputs_filtered (": ", stream);
+ annotate_field_value ();
if (!field_is_static (&TYPE_FIELD (type, i))
&& TYPE_FIELD_PACKED (type, i))
diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
index c66e5d1..31e9a56 100644
--- a/gdb/m2-lang.c
+++ b/gdb/m2-lang.c
@@ -145,10 +145,7 @@ m2_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
{
if (in_quotes)
{
- if (options->inspect_it)
- fputs_filtered ("\\\", ", stream);
- else
- fputs_filtered ("\", ", stream);
+ fputs_filtered ("\", ", stream);
in_quotes = 0;
}
m2_printchar (string[i], type, stream);
@@ -161,10 +158,7 @@ m2_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
{
if (!in_quotes)
{
- if (options->inspect_it)
- fputs_filtered ("\\\"", stream);
- else
- fputs_filtered ("\"", stream);
+ fputs_filtered ("\"", stream);
in_quotes = 1;
}
LA_EMIT_CHAR (string[i], type, stream, '"');
@@ -174,12 +168,7 @@ m2_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
/* Terminate the quotes if necessary. */
if (in_quotes)
- {
- if (options->inspect_it)
- fputs_filtered ("\\\"", stream);
- else
- fputs_filtered ("\"", stream);
- }
+ fputs_filtered ("\"", stream);
if (force_ellipses || i < length)
fputs_filtered ("...", stream);
diff --git a/gdb/main.c b/gdb/main.c
index 7cd2d03..c9439bb 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -451,7 +451,6 @@ captured_main (void *data)
{"n", no_argument, &inhibit_gdbinit, 1},
{"batch-silent", no_argument, 0, 'B'},
{"batch", no_argument, &batch_flag, 1},
- {"epoch", no_argument, &epoch_interface, 1},
/* This is a synonym for "--annotate=1". --annotate is now
preferred, but keep this here for a long time because people
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 8ac323d..39f53fb 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -396,10 +396,7 @@ objc_printstr (struct ui_file *stream, struct type *type,
{
if (in_quotes)
{
- if (options->inspect_it)
- fputs_filtered ("\\\", ", stream);
- else
- fputs_filtered ("\", ", stream);
+ fputs_filtered ("\", ", stream);
in_quotes = 0;
}
objc_printchar (string[i], type, stream);
@@ -412,10 +409,7 @@ objc_printstr (struct ui_file *stream, struct type *type,
{
if (!in_quotes)
{
- if (options->inspect_it)
- fputs_filtered ("\\\"", stream);
- else
- fputs_filtered ("\"", stream);
+ fputs_filtered ("\"", stream);
in_quotes = 1;
}
objc_emit_char (string[i], type, stream, '"');
@@ -425,12 +419,7 @@ objc_printstr (struct ui_file *stream, struct type *type,
/* Terminate the quotes if necessary. */
if (in_quotes)
- {
- if (options->inspect_it)
- fputs_filtered ("\\\"", stream);
- else
- fputs_filtered ("\"", stream);
- }
+ fputs_filtered ("\"", stream);
if (force_ellipses || i < length)
fputs_filtered ("...", stream);
diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index 3fa5f34..07006cd 100644
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -279,10 +279,7 @@ pascal_printstr (struct ui_file *stream, struct type *type,
{
if (in_quotes)
{
- if (options->inspect_it)
- fputs_filtered ("\\', ", stream);
- else
- fputs_filtered ("', ", stream);
+ fputs_filtered ("', ", stream);
in_quotes = 0;
}
pascal_printchar (current_char, type, stream);
@@ -295,10 +292,7 @@ pascal_printstr (struct ui_file *stream, struct type *type,
{
if ((!in_quotes) && (PRINT_LITERAL_FORM (current_char)))
{
- if (options->inspect_it)
- fputs_filtered ("\\'", stream);
- else
- fputs_filtered ("'", stream);
+ fputs_filtered ("'", stream);
in_quotes = 1;
}
pascal_one_char (current_char, stream, &in_quotes);
@@ -308,12 +302,7 @@ pascal_printstr (struct ui_file *stream, struct type *type,
/* Terminate the quotes if necessary. */
if (in_quotes)
- {
- if (options->inspect_it)
- fputs_filtered ("\\'", stream);
- else
- fputs_filtered ("'", stream);
- }
+ fputs_filtered ("'", stream);
if (force_ellipses || i < length)
fputs_filtered ("...", stream);
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index a403bc7..bcc055e 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -594,36 +594,17 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
{
wrap_here (n_spaces (2 + 2 * recurse));
}
- if (options->inspect_it)
- {
- if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
- fputs_filtered ("\"( ptr \"", stream);
- else
- fputs_filtered ("\"( nodef \"", stream);
- if (field_is_static (&TYPE_FIELD (type, i)))
- fputs_filtered ("static ", stream);
- fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
- language_cplus,
- DMGL_PARAMS | DMGL_ANSI);
- fputs_filtered ("\" \"", stream);
- fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
- language_cplus,
- DMGL_PARAMS | DMGL_ANSI);
- fputs_filtered ("\") \"", stream);
- }
- else
- {
- annotate_field_begin (TYPE_FIELD_TYPE (type, i));
-
- if (field_is_static (&TYPE_FIELD (type, i)))
- fputs_filtered ("static ", stream);
- fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
- language_cplus,
- DMGL_PARAMS | DMGL_ANSI);
- annotate_field_name_end ();
- fputs_filtered (" = ", stream);
- annotate_field_value ();
- }
+
+ annotate_field_begin (TYPE_FIELD_TYPE (type, i));
+
+ if (field_is_static (&TYPE_FIELD (type, i)))
+ fputs_filtered ("static ", stream);
+ fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
+ language_cplus,
+ DMGL_PARAMS | DMGL_ANSI);
+ annotate_field_name_end ();
+ fputs_filtered (" = ", stream);
+ annotate_field_value ();
if (!field_is_static (&TYPE_FIELD (type, i))
&& TYPE_FIELD_PACKED (type, i))
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 82ae183..3d891cd 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -934,7 +934,7 @@ validate_format (struct format_data fmt, char *cmdname)
first argument ("/x myvar" for example, to print myvar in hex). */
static void
-print_command_1 (char *exp, int inspect, int voidprint)
+print_command_1 (char *exp, int voidprint)
{
struct expression *expr;
struct cleanup *old_chain = 0;
@@ -979,17 +979,13 @@ print_command_1 (char *exp, int inspect, int voidprint)
else
annotate_value_begin (value_type (val));
- if (inspect)
- printf_unfiltered ("\031(gdb-makebuffer \"%s\" %d '(\"",
- exp, histindex);
- else if (histindex >= 0)
+ if (histindex >= 0)
printf_filtered ("$%d = ", histindex);
if (histindex >= 0)
annotate_value_history_value ();
get_formatted_print_options (&opts, format);
- opts.inspect_it = inspect;
opts.raw = fmt.raw;
print_formatted (val, fmt.size, &opts, gdb_stdout);
@@ -999,9 +995,6 @@ print_command_1 (char *exp, int inspect, int voidprint)
annotate_value_history_end ();
else
annotate_value_end ();
-
- if (inspect)
- printf_unfiltered ("\") )\030");
}
if (cleanup)
@@ -1011,23 +1004,14 @@ print_command_1 (char *exp, int inspect, int voidprint)
static void
print_command (char *exp, int from_tty)
{
- print_command_1 (exp, 0, 1);
-}
-
-/* Same as print, except in epoch, it gets its own window. */
-static void
-inspect_command (char *exp, int from_tty)
-{
- extern int epoch_interface;
-
- print_command_1 (exp, epoch_interface, 1);
+ print_command_1 (exp, 1);
}
/* Same as print, except it doesn't print void results. */
static void
call_command (char *exp, int from_tty)
{
- print_command_1 (exp, 0, 0);
+ print_command_1 (exp, 0);
}
void
@@ -2600,11 +2584,7 @@ EXP may be preceded with /FMT, where FMT is a format letter\n\
but no count or size letter (see \"x\" command)."));
set_cmd_completer (c, expression_completer);
add_com_alias ("p", "print", class_vars, 1);
-
- c = add_com ("inspect", class_vars, inspect_command, _("\
-Same as \"print\" command, except that if you are running in the epoch\n\
-environment, the value is printed in its own window."));
- set_cmd_completer (c, expression_completer);
+ add_com_alias ("inspect", "print", class_vars, 1);
add_setshow_uinteger_cmd ("max-symbolic-offset", no_class,
&max_symbolic_offset, _("\
diff --git a/gdb/top.c b/gdb/top.c
index 91f14c3..e9d6c1c 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -138,8 +138,6 @@ char gdb_dirbuf[1024];
void (*window_hook) (FILE *, char *);
-int epoch_interface;
-
/* Buffer used for reading command lines, and the size
allocated for it so far. */
diff --git a/gdb/top.h b/gdb/top.h
index a7b55b7..2131026 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -28,7 +28,6 @@ extern int in_user_command;
extern int confirm;
extern char gdb_dirbuf[1024];
extern int inhibit_gdbinit;
-extern int epoch_interface;
extern char gdbinit[];
extern void print_gdb_version (struct ui_file *);
diff --git a/gdb/valprint.c b/gdb/valprint.c
index b8fdcaa..42dacc5 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -116,7 +116,6 @@ struct value_print_options user_print_options =
0, /* output_format */
0, /* format */
0, /* stop_print_at_null */
- 0, /* inspect_it */
0, /* print_array_indexes */
0, /* deref_ref */
1, /* static_field_print */
@@ -2211,8 +2210,6 @@ print_converted_chars_to_obstack (struct obstack *obstack,
must output and a comma and a quote. */
if (last != START)
obstack_grow_wstr (obstack, LCST (", "));
- if (options->inspect_it)
- obstack_grow_wstr (obstack, LCST ("\\"));
obstack_grow (obstack, &wide_quote_char, sizeof (gdb_wchar_t));
}
/* Output the character. */
@@ -2240,8 +2237,6 @@ print_converted_chars_to_obstack (struct obstack *obstack,
{
/* We were outputting a single string. Terminate the
string. */
- if (options->inspect_it)
- obstack_grow_wstr (obstack, LCST ("\\"));
obstack_grow (obstack, &wide_quote_char, sizeof (gdb_wchar_t));
}
if (last != START)
@@ -2272,8 +2267,6 @@ print_converted_chars_to_obstack (struct obstack *obstack,
{
/* If we were outputting a string of SINGLE characters,
terminate the quote. */
- if (options->inspect_it)
- obstack_grow_wstr (obstack, LCST ("\\"));
obstack_grow (obstack, &wide_quote_char, sizeof (gdb_wchar_t));
}
if (last != START)
@@ -2294,11 +2287,7 @@ print_converted_chars_to_obstack (struct obstack *obstack,
characters, the string must be terminated. Otherwise,
REPEAT and INCOMPLETE are always left properly terminated. */
if (last == SINGLE)
- {
- if (options->inspect_it)
- obstack_grow_wstr (obstack, LCST ("\\"));
- obstack_grow (obstack, &wide_quote_char, sizeof (gdb_wchar_t));
- }
+ obstack_grow (obstack, &wide_quote_char, sizeof (gdb_wchar_t));
return;
}
diff --git a/gdb/valprint.h b/gdb/valprint.h
index 493f627..ae28803 100644
--- a/gdb/valprint.h
+++ b/gdb/valprint.h
@@ -66,9 +66,6 @@ struct value_print_options
/* Stop printing at null character? */
int stop_print_at_null;
- /* True if this value is being printed in an epoch window. */
- int inspect_it;
-
/* True if we should print the index of each element when printing
an array. */
int print_array_indexes;
@@ -156,9 +153,10 @@ extern void print_function_pointer_address (const struct value_print_options *op
CORE_ADDR address,
struct ui_file *stream);
-int read_string (CORE_ADDR addr, int len, int width, unsigned int fetchlimit,
- enum bfd_endian byte_order, gdb_byte **buffer,
- int *bytes_read);
+extern int read_string (CORE_ADDR addr, int len, int width,
+ unsigned int fetchlimit,
+ enum bfd_endian byte_order, gdb_byte **buffer,
+ int *bytes_read);
extern void val_print_optimized_out (struct ui_file *stream);
generated by cgit v1.1 at 2024-12-03 22:24:52 +0000