From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23960 invoked by alias); 27 Jul 2012 14:07:43 -0000 Received: (qmail 23939 invoked by uid 22791); 27 Jul 2012 14:07:39 -0000 X-SWARE-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 27 Jul 2012 14:07:23 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1SulCM-0006VP-NN from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Fri, 27 Jul 2012 07:07:22 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Fri, 27 Jul 2012 07:07:22 -0700 Received: from qiyao.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.1.289.1; Fri, 27 Jul 2012 07:07:21 -0700 From: Yao Qi To: Subject: [PATCH 7/7] code indentation. Date: Fri, 27 Jul 2012 14:07:00 -0000 Message-ID: <1343397901-15051-8-git-send-email-yao@codesourcery.com> In-Reply-To: <1343397901-15051-1-git-send-email-yao@codesourcery.com> References: <1343397901-15051-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes 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 X-SW-Source: 2012-07/txt/msg00683.txt.bz2 gdb: 2012-07-27 Yao Qi * cli/cli-setshow.c (do_set_command): Code indentation. (do_show_command): Likewise. --- gdb/cli/cli-setshow.c | 538 ++++++++++++++++++++++++------------------------- 1 files changed, 268 insertions(+), 270 deletions(-) diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c index 17c336e..7a1dd4e 100644 --- a/gdb/cli/cli-setshow.c +++ b/gdb/cli/cli-setshow.c @@ -130,247 +130,247 @@ do_set_command (char *arg, int from_tty, struct cmd_list_element *c) gdb_assert (c->type == set_cmd); - switch (c->var_type) - { - case var_string: + switch (c->var_type) + { + case var_string: + { + char *new; + char *p; + char *q; + int ch; + + if (arg == NULL) + arg = ""; + new = (char *) xmalloc (strlen (arg) + 2); + p = arg; + q = new; + while ((ch = *p++) != '\000') { - char *new; - char *p; - char *q; - int ch; - - if (arg == NULL) - arg = ""; - new = (char *) xmalloc (strlen (arg) + 2); - p = arg; - q = new; - while ((ch = *p++) != '\000') + if (ch == '\\') { - if (ch == '\\') - { - /* \ at end of argument is used after spaces - so they won't be lost. */ - /* This is obsolete now that we no longer strip - trailing whitespace and actually, the backslash - didn't get here in my test, readline or - something did something funky with a backslash - right before a newline. */ - if (*p == 0) - break; - ch = parse_escape (get_current_arch (), &p); - if (ch == 0) - break; /* C loses */ - else if (ch > 0) - *q++ = ch; - } - else + /* \ at end of argument is used after spaces + so they won't be lost. */ + /* This is obsolete now that we no longer strip + trailing whitespace and actually, the backslash + didn't get here in my test, readline or + something did something funky with a backslash + right before a newline. */ + if (*p == 0) + break; + ch = parse_escape (get_current_arch (), &p); + if (ch == 0) + break; /* C loses */ + else if (ch > 0) *q++ = ch; } + else + *q++ = ch; + } #if 0 - if (*(p - 1) != '\\') - *q++ = ' '; + if (*(p - 1) != '\\') + *q++ = ' '; #endif - *q++ = '\0'; - new = (char *) xrealloc (new, q - new); + *q++ = '\0'; + new = (char *) xrealloc (new, q - new); - if (*(char **) c->var == NULL - || strcmp (*(char **) c->var, new) != 0) - { - xfree (*(char **) c->var); - *(char **) c->var = new; + if (*(char **) c->var == NULL + || strcmp (*(char **) c->var, new) != 0) + { + xfree (*(char **) c->var); + *(char **) c->var = new; - option_changed = 1; - } - else - xfree (new); + option_changed = 1; } - break; - case var_string_noescape: - if (arg == NULL) - arg = ""; + else + xfree (new); + } + break; + case var_string_noescape: + if (arg == NULL) + arg = ""; - if (*(char **) c->var == NULL || strcmp (*(char **) c->var, arg) != 0) - { - xfree (*(char **) c->var); - *(char **) c->var = xstrdup (arg); + if (*(char **) c->var == NULL || strcmp (*(char **) c->var, arg) != 0) + { + xfree (*(char **) c->var); + *(char **) c->var = xstrdup (arg); - option_changed = 1; - } - break; - case var_filename: - if (arg == NULL) - error_no_arg (_("filename to set it to.")); - /* FALLTHROUGH */ - case var_optional_filename: - { - char *val = NULL; + option_changed = 1; + } + break; + case var_filename: + if (arg == NULL) + error_no_arg (_("filename to set it to.")); + /* FALLTHROUGH */ + case var_optional_filename: + { + char *val = NULL; - if (arg != NULL) - { - /* Clear trailing whitespace of filename. */ - char *ptr = arg + strlen (arg) - 1; + if (arg != NULL) + { + /* Clear trailing whitespace of filename. */ + char *ptr = arg + strlen (arg) - 1; - while (ptr >= arg && (*ptr == ' ' || *ptr == '\t')) - ptr--; - *(ptr + 1) = '\0'; + while (ptr >= arg && (*ptr == ' ' || *ptr == '\t')) + ptr--; + *(ptr + 1) = '\0'; - val = tilde_expand (arg); - } - else - val = xstrdup (""); + val = tilde_expand (arg); + } + else + val = xstrdup (""); - if (*(char **) c->var == NULL - || strcmp (*(char **) c->var, val) != 0) - { - xfree (*(char **) c->var); - *(char **) c->var = val; + if (*(char **) c->var == NULL + || strcmp (*(char **) c->var, val) != 0) + { + xfree (*(char **) c->var); + *(char **) c->var = val; - option_changed = 1; - } - else - xfree (val); + option_changed = 1; } - break; - case var_boolean: - { - int val = parse_binary_operation (arg); + else + xfree (val); + } + break; + case var_boolean: + { + int val = parse_binary_operation (arg); - if (val != *(int *) c->var) - { - *(int *) c->var = val; + if (val != *(int *) c->var) + { + *(int *) c->var = val; - option_changed = 1; - } + option_changed = 1; } - break; - case var_auto_boolean: - { - enum auto_boolean val = parse_auto_binary_operation (arg); + } + break; + case var_auto_boolean: + { + enum auto_boolean val = parse_auto_binary_operation (arg); - if (*(enum auto_boolean *) c->var != val) - { - *(enum auto_boolean *) c->var = val; + if (*(enum auto_boolean *) c->var != val) + { + *(enum auto_boolean *) c->var = val; - option_changed = 1; - } + option_changed = 1; } - break; - case var_uinteger: - case var_zuinteger: - if (arg == NULL) - error_no_arg (_("integer to set it to.")); - { - unsigned int val = parse_and_eval_long (arg); + } + break; + case var_uinteger: + case var_zuinteger: + if (arg == NULL) + error_no_arg (_("integer to set it to.")); + { + unsigned int val = parse_and_eval_long (arg); - if (c->var_type == var_uinteger && val == 0) - val = UINT_MAX; + if (c->var_type == var_uinteger && val == 0) + val = UINT_MAX; - if (*(unsigned int *) c->var != val) - { - *(unsigned int *) c->var = val; + if (*(unsigned int *) c->var != val) + { + *(unsigned int *) c->var = val; - option_changed = 1; - } + option_changed = 1; } - break; - case var_integer: - case var_zinteger: - { - unsigned int val; + } + break; + case var_integer: + case var_zinteger: + { + unsigned int val; - if (arg == NULL) - error_no_arg (_("integer to set it to.")); - val = parse_and_eval_long (arg); - if (val == 0 && c->var_type == var_integer) - val = INT_MAX; - else if (val >= INT_MAX) - error (_("integer %u out of range"), val); + if (arg == NULL) + error_no_arg (_("integer to set it to.")); + val = parse_and_eval_long (arg); + if (val == 0 && c->var_type == var_integer) + val = INT_MAX; + else if (val >= INT_MAX) + error (_("integer %u out of range"), val); - if (*(int *) c->var != val) - { - *(int *) c->var = val; + if (*(int *) c->var != val) + { + *(int *) c->var = val; - option_changed = 1; - } - break; + option_changed = 1; } - case var_enum: + break; + } + case var_enum: + { + int i; + int len; + int nmatches; + const char *match = NULL; + char *p; + + /* If no argument was supplied, print an informative error + message. */ + if (arg == NULL) { - int i; - int len; - int nmatches; - const char *match = NULL; - char *p; - - /* If no argument was supplied, print an informative error - message. */ - if (arg == NULL) + char *msg; + int msg_len = 0; + + for (i = 0; c->enums[i]; i++) + msg_len += strlen (c->enums[i]) + 2; + + msg = xmalloc (msg_len); + *msg = '\0'; + make_cleanup (xfree, msg); + + for (i = 0; c->enums[i]; i++) { - char *msg; - int msg_len = 0; - - for (i = 0; c->enums[i]; i++) - msg_len += strlen (c->enums[i]) + 2; - - msg = xmalloc (msg_len); - *msg = '\0'; - make_cleanup (xfree, msg); - - for (i = 0; c->enums[i]; i++) - { - if (i != 0) - strcat (msg, ", "); - strcat (msg, c->enums[i]); - } - error (_("Requires an argument. Valid arguments are %s."), - msg); + if (i != 0) + strcat (msg, ", "); + strcat (msg, c->enums[i]); } + error (_("Requires an argument. Valid arguments are %s."), + msg); + } - p = strchr (arg, ' '); + p = strchr (arg, ' '); - if (p) - len = p - arg; - else - len = strlen (arg); + if (p) + len = p - arg; + else + len = strlen (arg); - nmatches = 0; - for (i = 0; c->enums[i]; i++) - if (strncmp (arg, c->enums[i], len) == 0) + nmatches = 0; + for (i = 0; c->enums[i]; i++) + if (strncmp (arg, c->enums[i], len) == 0) + { + if (c->enums[i][len] == '\0') { - if (c->enums[i][len] == '\0') - { - match = c->enums[i]; - nmatches = 1; - break; /* Exact match. */ - } - else - { - match = c->enums[i]; - nmatches++; - } + match = c->enums[i]; + nmatches = 1; + break; /* Exact match. */ } + else + { + match = c->enums[i]; + nmatches++; + } + } - if (nmatches <= 0) - error (_("Undefined item: \"%s\"."), arg); + if (nmatches <= 0) + error (_("Undefined item: \"%s\"."), arg); - if (nmatches > 1) - error (_("Ambiguous item \"%s\"."), arg); + if (nmatches > 1) + error (_("Ambiguous item \"%s\"."), arg); - if (*(const char **) c->var != match) - { - *(const char **) c->var = match; + if (*(const char **) c->var != match) + { + *(const char **) c->var = match; - option_changed = 1; - } + option_changed = 1; } - break; - default: - error (_("gdb internal error: bad var_type in do_setshow_command")); - } - c->func (c, NULL, from_tty); - if (deprecated_set_hook) - deprecated_set_hook (c); + } + break; + default: + error (_("gdb internal error: bad var_type in do_setshow_command")); + } + c->func (c, NULL, from_tty); + if (deprecated_set_hook) + deprecated_set_hook (c); return option_changed; } @@ -384,97 +384,95 @@ void do_show_command (char *arg, int from_tty, struct cmd_list_element *c) { struct ui_out *uiout = current_uiout; + struct cleanup *old_chain; + struct ui_file *stb; gdb_assert (c->type == show_cmd); - { - struct cleanup *old_chain; - struct ui_file *stb; - stb = mem_fileopen (); - old_chain = make_cleanup_ui_file_delete (stb); + stb = mem_fileopen (); + old_chain = make_cleanup_ui_file_delete (stb); - /* Possibly call the pre hook. */ - if (c->pre_show_hook) - (c->pre_show_hook) (c); + /* Possibly call the pre hook. */ + if (c->pre_show_hook) + (c->pre_show_hook) (c); - switch (c->var_type) + switch (c->var_type) + { + case var_string: + if (*(char **) c->var) + fputstr_filtered (*(char **) c->var, '"', stb); + break; + case var_string_noescape: + case var_optional_filename: + case var_filename: + case var_enum: + if (*(char **) c->var) + fputs_filtered (*(char **) c->var, stb); + break; + case var_boolean: + fputs_filtered (*(int *) c->var ? "on" : "off", stb); + break; + case var_auto_boolean: + switch (*(enum auto_boolean*) c->var) { - case var_string: - if (*(char **) c->var) - fputstr_filtered (*(char **) c->var, '"', stb); - break; - case var_string_noescape: - case var_optional_filename: - case var_filename: - case var_enum: - if (*(char **) c->var) - fputs_filtered (*(char **) c->var, stb); - break; - case var_boolean: - fputs_filtered (*(int *) c->var ? "on" : "off", stb); + case AUTO_BOOLEAN_TRUE: + fputs_filtered ("on", stb); break; - case var_auto_boolean: - switch (*(enum auto_boolean*) c->var) - { - case AUTO_BOOLEAN_TRUE: - fputs_filtered ("on", stb); - break; - case AUTO_BOOLEAN_FALSE: - fputs_filtered ("off", stb); - break; - case AUTO_BOOLEAN_AUTO: - fputs_filtered ("auto", stb); - break; - default: - internal_error (__FILE__, __LINE__, - _("do_setshow_command: " - "invalid var_auto_boolean")); - break; - } + case AUTO_BOOLEAN_FALSE: + fputs_filtered ("off", stb); break; - case var_uinteger: - case var_zuinteger: - if (c->var_type == var_uinteger - && *(unsigned int *) c->var == UINT_MAX) - fputs_filtered ("unlimited", stb); - else - fprintf_filtered (stb, "%u", *(unsigned int *) c->var); + case AUTO_BOOLEAN_AUTO: + fputs_filtered ("auto", stb); break; - case var_integer: - case var_zinteger: - if (c->var_type == var_integer - && *(int *) c->var == INT_MAX) - fputs_filtered ("unlimited", stb); - else - fprintf_filtered (stb, "%d", *(int *) c->var); - break; - default: - error (_("gdb internal error: bad var_type in do_setshow_command")); + internal_error (__FILE__, __LINE__, + _("do_show_command: " + "invalid var_auto_boolean")); + break; } + break; + case var_uinteger: + case var_zuinteger: + if (c->var_type == var_uinteger + && *(unsigned int *) c->var == UINT_MAX) + fputs_filtered ("unlimited", stb); + else + fprintf_filtered (stb, "%u", *(unsigned int *) c->var); + break; + case var_integer: + case var_zinteger: + if (c->var_type == var_integer + && *(int *) c->var == INT_MAX) + fputs_filtered ("unlimited", stb); + else + fprintf_filtered (stb, "%d", *(int *) c->var); + break; + default: + error (_("gdb internal error: bad var_type in do_show_command")); + } - /* FIXME: cagney/2005-02-10: Need to split this in half: code to - convert the value into a string (esentially the above); and - code to print the value out. For the latter there should be - MI and CLI specific versions. */ - if (ui_out_is_mi_like_p (uiout)) - ui_out_field_stream (uiout, "value", stb); - else - { - char *value = ui_file_xstrdup (stb, NULL); + /* FIXME: cagney/2005-02-10: Need to split this in half: code to + convert the value into a string (esentially the above); and + code to print the value out. For the latter there should be + MI and CLI specific versions. */ - make_cleanup (xfree, value); - if (c->show_value_func != NULL) - c->show_value_func (gdb_stdout, from_tty, c, value); - else - deprecated_show_value_hack (gdb_stdout, from_tty, c, value); - } - do_cleanups (old_chain); + if (ui_out_is_mi_like_p (uiout)) + ui_out_field_stream (uiout, "value", stb); + else + { + char *value = ui_file_xstrdup (stb, NULL); - c->func (c, NULL, from_tty); + make_cleanup (xfree, value); + if (c->show_value_func != NULL) + c->show_value_func (gdb_stdout, from_tty, c, value); + else + deprecated_show_value_hack (gdb_stdout, from_tty, c, value); } + do_cleanups (old_chain); + + c->func (c, NULL, from_tty); } /* Show all the settings in a list of show commands. */ -- 1.7.7.6