From a0d34a3956f504e755638cadb2bac2b03e4e37e7 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 7 Sep 2015 09:15:15 +0100 Subject: [PATCH] gdb: Simplify parse_frame_specification. Remove an unneeded parameter from parse_frame_specification, replace with a fixed string within parse_frame_specification. The message was the same in every place that parse_frame_specification was used anyway. gdb/ChangeLog: * stack.c (parse_frame_specification): Remove message parameter, replace with fixed string in function body, update function comment. (frame_info): Remove message to parse_frame_specification. (select_frame_command): Likewise. --- gdb/ChangeLog | 8 ++++++++ gdb/stack.c | 18 ++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 19bfc2e..e77f1bd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2015-10-12 Andrew Burgess + * stack.c (parse_frame_specification): Remove message parameter, + replace with fixed string in function body, update function + comment. + (frame_info): Remove message to parse_frame_specification. + (select_frame_command): Likewise. + +2015-10-12 Andrew Burgess + * stack.c (parse_frame_specification): Delete. (parse_frame_specification_1): Rename to parse_frame_specification. diff --git a/gdb/stack.c b/gdb/stack.c index e2b4dac..b825bdf 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1273,15 +1273,13 @@ print_frame (struct frame_info *frame, int print_level, } -/* Read a frame specification in whatever the appropriate format is - from FRAME_EXP. Call error(), printing MESSAGE, if the - specification is in any way invalid (so this function never returns - NULL). When SEPECTED_P is non-NULL set its target to indicate that - the default selected frame was used. */ +/* Read a frame specification in whatever the appropriate format is from + FRAME_EXP. Call error() if the specification is in any way invalid (so + this function never returns NULL). When SEPECTED_P is non-NULL set its + target to indicate that the default selected frame was used. */ static struct frame_info * -parse_frame_specification (const char *frame_exp, const char *message, - int *selected_frame_p) +parse_frame_specification (const char *frame_exp, int *selected_frame_p) { int numargs; struct value *args[4]; @@ -1330,7 +1328,7 @@ parse_frame_specification (const char *frame_exp, const char *message, { if (selected_frame_p != NULL) (*selected_frame_p) = 1; - return get_selected_frame (message); + return get_selected_frame (_("No stack.")); } /* None of the remaining use the selected frame. */ @@ -1425,7 +1423,7 @@ frame_info (char *addr_exp, int from_tty) CORE_ADDR caller_pc = 0; int caller_pc_p = 0; - fi = parse_frame_specification (addr_exp, "No stack.", &selected_frame_p); + fi = parse_frame_specification (addr_exp, &selected_frame_p); gdbarch = get_frame_arch (fi); /* Name of the value returned by get_frame_pc(). Per comments, "pc" @@ -2278,7 +2276,7 @@ find_relative_frame (struct frame_info *frame, int *level_offset_ptr) void select_frame_command (char *level_exp, int from_tty) { - select_frame (parse_frame_specification (level_exp, "No stack.", NULL)); + select_frame (parse_frame_specification (level_exp, NULL)); } /* The "frame" command. With no argument, print the selected frame -- 2.7.4