From 1c95d7ab2e12e00756d21ef44c7539f8f9edc56f Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Fri, 13 May 1994 18:18:57 +0000 Subject: gcc -Wall lint: * breakpoint.c (watchpoint_check): Remove unused variable b. * stack.c (print_frame_info): Move sp and buf inside #if. * eval.c (evaluate_subexp): Remove unused variables pp, mangle_ptr, ptr, and mangle_tstr. * valarith.c (value_x_binop): Remove unused variables mangle_tstr and mangle_ptr. * symtab.c (lookup_symtab): Put variable copy inside #if. (decode_line_1): Put variable q1 inside #if 0. * target.h: Declare target_link. * infrun.c (wait_for_inferior): Remove unused variables signame. * remote.c (remote_resume): Remove unused variable name. * c-exp.y (parse_number): Parenthesize operand of shift. * dbxread.c (record_minimal_symbol): Parenthesize operand of && (this is a semantic change, the warning seems to have detected a bug). * dbxread.c (end_psymtab): Move variable p1 inside #if. * coffread.c: Move variable temptype inside #if. * ch-typeprint.c (chill_type_print_base): Remove unused variable name. * ch-valprint.c: #include typeprint.h and ch-lang.h. (chill_val_print): Remove unused variable in_range. (chill_val_print): Remove statement "length > TYPE_LENGTH (type);". (chill_val_print): Add default case for switch. * stabsread.h: Declare stabsect_build_psymtabs. * os9kread.c (read_minimal_symbols): Make this return void. (os9k_symfile_read): Remove unused variables stb_exist and val. (os9k_symfile_init): Remove unused variable val. (fill_sym): Remove unused variable id. (read_os9k_psymtab): Put variable back_to inside #if 0. Remove unused variable nsl. Remove unused variable symfile_bfd. #if 0 unused variables lbrac_unmatched_complaint and lbrac_mismatch_complaint. Remove declaration for non-existent function os9k_next_symbol_text. * annotate.c, annotate.h: New files, containing a function for each annotation which outputs it. * Move breakpoints_changed from breakpoint.c to annotate.c. * breakpoint.c, blockframe.c, infrun.c, cp-valprint.c, main.c, printcmd.c, source.c, stack.c, utils.c, valprint.c: Use annotate.c functions to output annotations. * Makefile.in (OBS): Add annotate.o. --- gdb/cp-valprint.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'gdb/cp-valprint.c') diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 0a4c841..af8d767 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -26,6 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "command.h" #include "gdbcmd.h" #include "demangle.h" +#include "annotate.h" int vtblprint; /* Controls printing of vtbl's */ int objectprint; /* Controls looking up an object's derived type @@ -283,21 +284,14 @@ cp_print_value_fields (type, valaddr, stream, format, recurse, pretty, } else { - if (annotation_level > 1) - { - printf_filtered ("\n\032\032field-begin "); - print_value_flags (TYPE_FIELD_TYPE (type, i)); - printf_filtered ("\n"); - } + annotate_field_begin (TYPE_FIELD_TYPE (type, i)); fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i), language_cplus, DMGL_PARAMS | DMGL_ANSI); - if (annotation_level > 1) - printf_filtered ("\n\032\032field-name-end\n"); + annotate_field_name_end (); fputs_filtered (" = ", stream); - if (annotation_level > 1) - printf_filtered ("\n\032\032field-value\n"); + annotate_field_value (); } if (TYPE_FIELD_PACKED (type, i)) @@ -332,8 +326,7 @@ cp_print_value_fields (type, valaddr, stream, format, recurse, pretty, 0, stream, format, 0, recurse + 1, pretty); } } - if (annotation_level > 1) - printf_filtered ("\n\032\032field-end\n"); + annotate_field_end (); } if (pretty) -- cgit v1.1