From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26372 invoked by alias); 31 May 2013 14:16:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 26359 invoked by uid 89); 31 May 2013 14:16:25 -0000 X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 31 May 2013 14:16:24 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1UiQ7x-0004eJ-Uj from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Fri, 31 May 2013 07:16:21 -0700 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Fri, 31 May 2013 07:16:21 -0700 Received: from qiyao.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.2.247.3; Fri, 31 May 2013 07:16:16 -0700 From: Yao Qi To: Subject: [PATCH] Remove parse_print_values Date: Fri, 31 May 2013 14:16:00 -0000 Message-ID: <1370009816-9119-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-05/txt/msg01108.txt.bz2 Hi, I find function mi_parse_values_option and parse_print_values are identical, so this patch is to remove parse_print_values and make mi_parse_values_option external. Is it OK? gdb: 2013-05-31 Yao Qi * mi/mi-cmd-var.c (mi_no_values, mi_simple_values): Move to mi-parse.c. Make them static. (mi_all_values): Likewise. (mi_parse_values_option): Move to mi-parse.c. Make it external. * mi/mi-cmds.h (mi_no_values, mi_simple_values, mi_all_values): Remove the declarations. * mi/mi-parse.c: Moved from mi-cmd-var.c. * mi/mi-parse.h (mi_parse_values_option): Declare. * mi/mi-cmd-stack.c: Include mi-parse.h. (parse_print_values): Remove (mi_cmd_stack_list_locals): Call mi_parse_values_option instead of parse_print_values. (mi_cmd_stack_list_args, mi_cmd_stack_list_variables): Likewise. --- gdb/mi/mi-cmd-stack.c | 25 ++++--------------------- gdb/mi/mi-cmd-var.c | 25 +------------------------ gdb/mi/mi-cmds.h | 4 ---- gdb/mi/mi-parse.c | 22 ++++++++++++++++++++++ gdb/mi/mi-parse.h | 4 ++++ 5 files changed, 31 insertions(+), 49 deletions(-) diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index dd365f3..762ebc9 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -35,6 +35,7 @@ #include "mi-getopt.h" #include "python/python.h" #include +#include "mi-parse.h" enum what_to_list { locals, arguments, all }; @@ -200,24 +201,6 @@ mi_cmd_stack_info_depth (char *command, char **argv, int argc) ui_out_field_int (current_uiout, "depth", i); } -static enum print_values -parse_print_values (char *name) -{ - if (strcmp (name, "0") == 0 - || strcmp (name, mi_no_values) == 0) - return PRINT_NO_VALUES; - else if (strcmp (name, "1") == 0 - || strcmp (name, mi_all_values) == 0) - return PRINT_ALL_VALUES; - else if (strcmp (name, "2") == 0 - || strcmp (name, mi_simple_values) == 0) - return PRINT_SIMPLE_VALUES; - else - error (_("Unknown value for PRINT_VALUES: must be: \ -0 or \"%s\", 1 or \"%s\", 2 or \"%s\""), - mi_no_values, mi_all_values, mi_simple_values); -} - /* Print a list of the locals for the current frame. With argument of 0, print only the names, with argument of 1 print also the values. */ @@ -238,7 +221,7 @@ mi_cmd_stack_list_locals (char *command, char **argv, int argc) error (_("-stack-list-locals: Usage: [--no-frame-filters] PRINT_VALUES")); frame = get_selected_frame (NULL); - print_value = parse_print_values (argv[raw_arg]); + print_value = mi_parse_values_option (argv[raw_arg]); if (! raw_arg && frame_filters) { @@ -293,7 +276,7 @@ mi_cmd_stack_list_args (char *command, char **argv, int argc) frame_high = -1; } - print_values = parse_print_values (argv[raw_arg]); + print_values = mi_parse_values_option (argv[raw_arg]); /* Let's position fi on the frame at which to start the display. Could be the innermost frame if the whole stack needs @@ -368,7 +351,7 @@ mi_cmd_stack_list_variables (char *command, char **argv, int argc) "[--no-frame-filters] PRINT_VALUES")); frame = get_selected_frame (NULL); - print_value = parse_print_values (argv[raw_arg]); + print_value = mi_parse_values_option (argv[raw_arg]); if (! raw_arg && frame_filters) { diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index a069346..86c28eb 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -29,10 +29,7 @@ #include "gdb_string.h" #include "mi-getopt.h" #include "gdbthread.h" - -const char mi_no_values[] = "--no-values"; -const char mi_simple_values[] = "--simple-values"; -const char mi_all_values[] = "--all-values"; +#include "mi-parse.h" extern unsigned int varobjdebug; /* defined in varobj.c. */ @@ -340,26 +337,6 @@ mi_cmd_var_info_num_children (char *command, char **argv, int argc) ui_out_field_int (uiout, "numchild", varobj_get_num_children (var)); } -/* Parse a string argument into a print_values value. */ - -static enum print_values -mi_parse_values_option (const char *arg) -{ - if (strcmp (arg, "0") == 0 - || strcmp (arg, mi_no_values) == 0) - return PRINT_NO_VALUES; - else if (strcmp (arg, "1") == 0 - || strcmp (arg, mi_all_values) == 0) - return PRINT_ALL_VALUES; - else if (strcmp (arg, "2") == 0 - || strcmp (arg, mi_simple_values) == 0) - return PRINT_SIMPLE_VALUES; - else - error (_("Unknown value for PRINT_VALUES\n\ -Must be: 0 or \"%s\", 1 or \"%s\", 2 or \"%s\""), - mi_no_values, mi_simple_values, mi_all_values); -} - /* Return 1 if given the argument PRINT_VALUES we should display the varobj VAR. */ diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h index 8199d15..8839319 100644 --- a/gdb/mi/mi-cmds.h +++ b/gdb/mi/mi-cmds.h @@ -28,10 +28,6 @@ enum print_values { PRINT_SIMPLE_VALUES }; -extern const char mi_no_values[]; -extern const char mi_simple_values[]; -extern const char mi_all_values[]; - typedef void (mi_cmd_argv_ftype) (char *command, char **argv, int argc); /* Declarations of the functions implementing each command. */ diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c index 15fb778..69ef7b8 100644 --- a/gdb/mi/mi-parse.c +++ b/gdb/mi/mi-parse.c @@ -28,6 +28,10 @@ #include "gdb_string.h" #include "cli/cli-utils.h" +const static char mi_no_values[] = "--no-values"; +const static char mi_simple_values[] = "--simple-values"; +const static char mi_all_values[] = "--all-values"; + /* Like parse_escape, but leave the results as a host char, not a target char. */ @@ -373,3 +377,21 @@ mi_parse (const char *cmd, char **token) parse->op = MI_COMMAND; return parse; } + +enum print_values +mi_parse_values_option (const char *name) +{ + if (strcmp (name, "0") == 0 + || strcmp (name, mi_no_values) == 0) + return PRINT_NO_VALUES; + else if (strcmp (name, "1") == 0 + || strcmp (name, mi_all_values) == 0) + return PRINT_ALL_VALUES; + else if (strcmp (name, "2") == 0 + || strcmp (name, mi_simple_values) == 0) + return PRINT_SIMPLE_VALUES; + else + error (_("Unknown value for PRINT_VALUES: must be: \ +0 or \"%s\", 1 or \"%s\", 2 or \"%s\""), + mi_no_values, mi_all_values, mi_simple_values); +} diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h index 324ae5d..d061b97 100644 --- a/gdb/mi/mi-parse.h +++ b/gdb/mi/mi-parse.h @@ -66,4 +66,8 @@ extern struct mi_parse *mi_parse (const char *cmd, char **token); extern void mi_parse_free (struct mi_parse *cmd); +/* Parse a string argument into a print_values value. */ + +enum print_values mi_parse_values_option (const char *name); + #endif -- 1.7.7.6