diff options
| author | Tom Tromey <tom@tromey.com> | 2019-06-16 17:51:01 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-06-25 07:48:39 -0600 |
| commit | 3332534318eb10a77e441307d28336996325558c (patch) | |
| tree | 214299cc413b0ea9ba2f86386351092c26b182a2 /gdb | |
| parent | 29d2c474f5a397017455da82e6dbc72629186359 (diff) | |
| download | gdb-3332534318eb10a77e441307d28336996325558c.zip gdb-3332534318eb10a77e441307d28336996325558c.tar.gz gdb-3332534318eb10a77e441307d28336996325558c.tar.bz2 | |
Remove NULL check from tui_set_exec_info_content
tui_set_exec_info_content ensures that the window's "execution_info"
is allocated, so the NULL check here is redundant and can be removed.
gdb/ChangeLog
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.c (tui_set_exec_info_content): Remove NULL
check.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/tui/tui-winsource.c | 70 |
2 files changed, 37 insertions, 38 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a97cfde..feec185 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-06-25 Tom Tromey <tom@tromey.com> + * tui/tui-winsource.c (tui_set_exec_info_content): Remove NULL + check. + +2019-06-25 Tom Tromey <tom@tromey.com> + * tui/tui-winsource.h (tui_alloc_source_buffer): Change return type to void. * tui/tui-winsource.c (tui_alloc_source_buffer): Change return diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 209d33d..5e60e9e 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -495,46 +495,40 @@ tui_set_exec_info_content (struct tui_win_info *win_info) if (exec_info_ptr->content == NULL) exec_info_ptr->content = tui_alloc_content (win_info->height, exec_info_ptr->type); - if (exec_info_ptr->content != NULL) - { - int i; - tui_update_breakpoint_info (win_info, 1); - for (i = 0; i < win_info->content_size; i++) - { - struct tui_win_element *element; - struct tui_win_element *src_element; - int mode; - - element = exec_info_ptr->content[i]; - src_element = win_info->content[i]; - - memset(element->which_element.simple_string, ' ', - sizeof(element->which_element.simple_string)); - element->which_element.simple_string[TUI_EXECINFO_SIZE - 1] = 0; - - /* Now update the exec info content based upon the state - of each line as indicated by the source content. */ - mode = src_element->which_element.source.has_break; - if (mode & TUI_BP_HIT) - element->which_element.simple_string[TUI_BP_HIT_POS] = - (mode & TUI_BP_HARDWARE) ? 'H' : 'B'; - else if (mode & (TUI_BP_ENABLED | TUI_BP_DISABLED)) - element->which_element.simple_string[TUI_BP_HIT_POS] = - (mode & TUI_BP_HARDWARE) ? 'h' : 'b'; - - if (mode & TUI_BP_ENABLED) - element->which_element.simple_string[TUI_BP_BREAK_POS] = '+'; - else if (mode & TUI_BP_DISABLED) - element->which_element.simple_string[TUI_BP_BREAK_POS] = '-'; - - if (src_element->which_element.source.is_exec_point) - element->which_element.simple_string[TUI_EXEC_POS] = '>'; - } - exec_info_ptr->content_size = win_info->content_size; + tui_update_breakpoint_info (win_info, 1); + for (int i = 0; i < win_info->content_size; i++) + { + struct tui_win_element *element; + struct tui_win_element *src_element; + int mode; + + element = exec_info_ptr->content[i]; + src_element = win_info->content[i]; + + memset(element->which_element.simple_string, ' ', + sizeof(element->which_element.simple_string)); + element->which_element.simple_string[TUI_EXECINFO_SIZE - 1] = 0; + + /* Now update the exec info content based upon the state + of each line as indicated by the source content. */ + mode = src_element->which_element.source.has_break; + if (mode & TUI_BP_HIT) + element->which_element.simple_string[TUI_BP_HIT_POS] = + (mode & TUI_BP_HARDWARE) ? 'H' : 'B'; + else if (mode & (TUI_BP_ENABLED | TUI_BP_DISABLED)) + element->which_element.simple_string[TUI_BP_HIT_POS] = + (mode & TUI_BP_HARDWARE) ? 'h' : 'b'; + + if (mode & TUI_BP_ENABLED) + element->which_element.simple_string[TUI_BP_BREAK_POS] = '+'; + else if (mode & TUI_BP_DISABLED) + element->which_element.simple_string[TUI_BP_BREAK_POS] = '-'; + + if (src_element->which_element.source.is_exec_point) + element->which_element.simple_string[TUI_EXEC_POS] = '>'; } - else - ret = TUI_FAILURE; + exec_info_ptr->content_size = win_info->content_size; } return ret; |