diff options
| author | Yao Qi <yao@codesourcery.com> | 2013-01-11 00:41:08 +0000 |
|---|---|---|
| committer | Yao Qi <yao@codesourcery.com> | 2013-01-11 00:41:08 +0000 |
| commit | f28045c2aa895911989432513d2728b6f339f743 (patch) | |
| tree | 1ea7fb576347e5bd9031069b9b58e5a3715439a4 | |
| parent | 5bf480a5cb916990831390cd06149459fad67627 (diff) | |
| download | gdb-f28045c2aa895911989432513d2728b6f339f743.zip gdb-f28045c2aa895911989432513d2728b6f339f743.tar.gz gdb-f28045c2aa895911989432513d2728b6f339f743.tar.bz2 | |
gdb/
* breakpoint.c (print_one_breakpoint_location): Remove dead code.
(update_dprintf_command_list): Assert that 'printf_line' is
non-null. Remove condition check.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 49 |
2 files changed, 26 insertions, 29 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6f4ad13..65cbabc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-01-11 Yao Qi <yao@codesourcery.com> + + * breakpoint.c (print_one_breakpoint_location): Remove dead code. + (update_dprintf_command_list): Assert that 'printf_line' is + non-null. Remove condition check. + 2013-01-10 Jan Kratochvil <jan.kratochvil@redhat.com> Code cleanup. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index e56d9df..4d76fa1 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -6094,15 +6094,6 @@ print_one_breakpoint_location (struct breakpoint *b, ui_out_text (uiout, " bytes\n"); } } - - if (!part_of_multiple && b->extra_string - && b->type == bp_dprintf && !b->commands) - { - annotate_field (7); - ui_out_text (uiout, "\t(agent printf) "); - ui_out_field_string (uiout, "printf", b->extra_string); - ui_out_text (uiout, "\n"); - } l = b->commands ? b->commands->commands : NULL; if (!part_of_multiple && l) @@ -8894,30 +8885,30 @@ update_dprintf_command_list (struct breakpoint *b) internal_error (__FILE__, __LINE__, _("Invalid dprintf style.")); + gdb_assert (printf_line != NULL); /* Manufacture a printf/continue sequence. */ - if (printf_line) - { - struct command_line *printf_cmd_line, *cont_cmd_line = NULL; + { + struct command_line *printf_cmd_line, *cont_cmd_line = NULL; - if (strcmp (dprintf_style, dprintf_style_agent) != 0) - { - cont_cmd_line = xmalloc (sizeof (struct command_line)); - cont_cmd_line->control_type = simple_control; - cont_cmd_line->body_count = 0; - cont_cmd_line->body_list = NULL; - cont_cmd_line->next = NULL; - cont_cmd_line->line = xstrdup ("continue"); - } + if (strcmp (dprintf_style, dprintf_style_agent) != 0) + { + cont_cmd_line = xmalloc (sizeof (struct command_line)); + cont_cmd_line->control_type = simple_control; + cont_cmd_line->body_count = 0; + cont_cmd_line->body_list = NULL; + cont_cmd_line->next = NULL; + cont_cmd_line->line = xstrdup ("continue"); + } - printf_cmd_line = xmalloc (sizeof (struct command_line)); - printf_cmd_line->control_type = simple_control; - printf_cmd_line->body_count = 0; - printf_cmd_line->body_list = NULL; - printf_cmd_line->next = cont_cmd_line; - printf_cmd_line->line = printf_line; + printf_cmd_line = xmalloc (sizeof (struct command_line)); + printf_cmd_line->control_type = simple_control; + printf_cmd_line->body_count = 0; + printf_cmd_line->body_list = NULL; + printf_cmd_line->next = cont_cmd_line; + printf_cmd_line->line = printf_line; - breakpoint_set_commands (b, printf_cmd_line); - } + breakpoint_set_commands (b, printf_cmd_line); + } } /* Update all dprintf commands, making their command lists reflect |