From patchwork Fri Sep 11 18:49:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 8654 Received: (qmail 56026 invoked by alias); 11 Sep 2015 18:50:12 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 55997 invoked by uid 89); 11 Sep 2015 18:50:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 X-HELO: mail-wi0-f172.google.com Received: from mail-wi0-f172.google.com (HELO mail-wi0-f172.google.com) (209.85.212.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 11 Sep 2015 18:50:03 +0000 Received: by wicfx3 with SMTP id fx3so74348520wic.1 for ; Fri, 11 Sep 2015 11:49:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=AjU2unqVmLgS5mS7QdiNvsPysEUhTfPT0SEMsd7FTF8=; b=LrmA111p4Ap3Kgm4oqkfOUtbetVEHgTZ8EcffNrOd5OdEKgoowo2ycfpIX6M2/uZA6 TuSFsxjYJ5HtLQAlZidHB5sDGqi8akVSRaVcW2g6Y5yvYwp8kEr+2/TnolMdUmjyCNvD DmdLcu3PzyrDPu34oYgByP1DsvKPH74o8opB7nySuJiX0G9pXoMT7J9eEEJtnzRgl1Bc ii8vN34quUNeHL1P8vRDRh4SYK7YAu+xxnh1yVYR9FixYAaxtAUtuaf/ypEsu3pk/vlB WDCE/CXh4K8lCIL06jkX+6akoxMmy0RG92ar4X8azH6YlsyPtU0j+BNj3l99hJzWjRgC YJbQ== X-Gm-Message-State: ALoCoQmMHnvvvc/AI3bWyYeueLfqrl+m23/LsnokG9ZZ4+PoWHQFsspAVofLSxksidG28Vh4dhCm X-Received: by 10.194.174.201 with SMTP id bu9mr471451wjc.73.1441997399803; Fri, 11 Sep 2015 11:49:59 -0700 (PDT) Received: from localhost (host81-131-206-173.range81-131.btcentralplus.com. [81.131.206.173]) by smtp.gmail.com with ESMTPSA id i6sm1658842wje.33.2015.09.11.11.49.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2015 11:49:59 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 7/9] gdb: Simplify parse_frame_specification. Date: Fri, 11 Sep 2015 19:49:41 +0100 Message-Id: <1ab61c6dfa5023cb22691efb528c0d7078675da8.1441996064.git.andrew.burgess@embecosm.com> In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes 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 dccac52..d530d06 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2015-09-11 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-09-11 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 1bc1fe6..9cde1e5 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); /* During the following value will be created and then displayed. @@ -2287,7 +2285,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