From 9c833c827518f1b9857da489901bd18fab3aa3c2 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Fri, 5 Aug 2005 21:08:54 +0000 Subject: Reviewed and approved by Mark Kettenis 2005-08-02 Fred Fish * defs.h (parse_frame_specification): Remove prototype. * stack.c (parse_frame_specification): Add prototype and make function static. (frame_info): Move common code outside if..then..else. --- gdb/ChangeLog | 7 +++++++ gdb/defs.h | 1 - gdb/stack.c | 10 +++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8f5cfdb..4331a31 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2005-08-02 Fred Fish + + * defs.h (parse_frame_specification): Remove prototype. + * stack.c (parse_frame_specification): Add prototype and + make function static. + (frame_info): Move common code outside if..then..else. + 2005-08-01 Daniel Jacobowitz * value.c (value_contents_writeable): Use value_contents_raw. diff --git a/gdb/defs.h b/gdb/defs.h index 1880bc0..2f0e2e6 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -1099,7 +1099,6 @@ extern void (*deprecated_show_load_progress) (const char *section, extern void (*deprecated_print_frame_info_listing_hook) (struct symtab * s, int line, int stopline, int noerror); -extern struct frame_info *parse_frame_specification (char *frame_exp); extern int (*deprecated_query_hook) (const char *, va_list) ATTRIBUTE_FPTR_PRINTF(1,0); extern void (*deprecated_warning_hook) (const char *, va_list) diff --git a/gdb/stack.c b/gdb/stack.c index 5a0c1f9..cd6e009 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -60,6 +60,8 @@ void _initialize_stack (void); /* Prototypes for local functions. */ +static struct frame_info *parse_frame_specification (char *frame_exp); + static void down_command (char *, int); static void down_silently_base (char *); @@ -844,7 +846,7 @@ parse_frame_specification_1 (const char *frame_exp, const char *message, error (_("Too many args in frame specification")); } -struct frame_info * +static struct frame_info * parse_frame_specification (char *frame_exp) { return parse_frame_specification_1 (frame_exp, NULL, NULL); @@ -932,15 +934,13 @@ frame_info (char *addr_exp, int from_tty) { printf_filtered (_("Stack level %d, frame at "), frame_relative_level (fi)); - deprecated_print_address_numeric (get_frame_base (fi), 1, gdb_stdout); - printf_filtered (":\n"); } else { printf_filtered (_("Stack frame at ")); - deprecated_print_address_numeric (get_frame_base (fi), 1, gdb_stdout); - printf_filtered (":\n"); } + deprecated_print_address_numeric (get_frame_base (fi), 1, gdb_stdout); + printf_filtered (":\n"); printf_filtered (" %s = ", pc_regname); deprecated_print_address_numeric (get_frame_pc (fi), 1, gdb_stdout); -- cgit v1.1