espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 09:58:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove more unnecessary casts of NULL

Browse Source 
I found a few more spots that unnecessarily cast NULL to a pointer
type.  My earlier search included a "*" in the cast, but these use a
typedef to a pointer type instead.  This patch removes these casts.

gdb/ChangeLog
2019-06-16  Tom Tromey  <tom@tromey.com>

	* tui/tui-data.c (tui_clear_win_detail, init_win_info)
	(tui_free_window, free_content, free_content_elements): Remove
	unnecessary cast.
	* tui/tui-windata.c (tui_display_all_data): Remove unnecessary
	cast.
	* tui/tui-regs.c (tui_show_register_group)
	(tui_display_registers_from, tui_display_reg_element_at_line):
	Remove unnecessary cast.
This commit is contained in:
Tom Tromey
2019-06-16 13:48:21 -06:00
parent bf5142e7fe
commit d04b44a16c
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2019-06-16 Tom Tromey <tom@tromey.com>
* tui/tui-data.c (tui_clear_win_detail, init_win_info)
(tui_free_window, free_content, free_content_elements): Remove
unnecessary cast.
* tui/tui-windata.c (tui_display_all_data): Remove unnecessary
cast.
* tui/tui-regs.c (tui_show_register_group)
(tui_display_registers_from, tui_display_reg_element_at_line):
Remove unnecessary cast.
2019-06-16 Andrew Burgess <andrew.burgess@embecosm.com> 2019-06-16 Andrew Burgess <andrew.burgess@embecosm.com>
* linux-nat.c (normal_mask): Delete. * linux-nat.c (normal_mask): Delete.

20
gdb/tui/tui-data.c
View File

@ -198,11 +198,9 @@ tui_clear_win_detail (struct tui_win_info *win_info)
wmove (win_info->generic.handle, 0, 0); wmove (win_info->generic.handle, 0, 0);
break; break;
case DATA_WIN: case DATA_WIN:
win_info->detail.data_display_info.data_content = win_info->detail.data_display_info.data_content = NULL;
(tui_win_content) NULL;
win_info->detail.data_display_info.data_content_count = 0; win_info->detail.data_display_info.data_content_count = 0;
win_info->detail.data_display_info.regs_content = win_info->detail.data_display_info.regs_content = NULL;
(tui_win_content) NULL;
win_info->detail.data_display_info.regs_content_count = 0; win_info->detail.data_display_info.regs_content_count = 0;
win_info->detail.data_display_info.regs_column_count = 1; win_info->detail.data_display_info.regs_column_count = 1;
win_info->detail.data_display_info.display_regs = FALSE; win_info->detail.data_display_info.display_regs = FALSE;
@ -516,9 +514,9 @@ init_win_info (struct tui_win_info *win_info)
win_info->detail.source_info.fullname = NULL; win_info->detail.source_info.fullname = NULL;
break; break;
case DATA_WIN: case DATA_WIN:
win_info->detail.data_display_info.data_content = (tui_win_content) NULL; win_info->detail.data_display_info.data_content = NULL;
win_info->detail.data_display_info.data_content_count = 0; win_info->detail.data_display_info.data_content_count = 0;
win_info->detail.data_display_info.regs_content = (tui_win_content) NULL; win_info->detail.data_display_info.regs_content = NULL;
win_info->detail.data_display_info.regs_content_count = 0; win_info->detail.data_display_info.regs_content_count = 0;
win_info->detail.data_display_info.regs_column_count = 1; win_info->detail.data_display_info.regs_column_count = 1;
win_info->detail.data_display_info.display_regs = FALSE; win_info->detail.data_display_info.display_regs = FALSE;
@ -686,13 +684,11 @@ tui_free_window (struct tui_win_info *win_info)
{ {
tui_free_data_content (win_info->detail.data_display_info.regs_content, tui_free_data_content (win_info->detail.data_display_info.regs_content,
win_info->detail.data_display_info.regs_content_count); win_info->detail.data_display_info.regs_content_count);
win_info->detail.data_display_info.regs_content = win_info->detail.data_display_info.regs_content = NULL;
(tui_win_content) NULL;
win_info->detail.data_display_info.regs_content_count = 0; win_info->detail.data_display_info.regs_content_count = 0;
tui_free_data_content (win_info->detail.data_display_info.data_content, tui_free_data_content (win_info->detail.data_display_info.data_content,
win_info->detail.data_display_info.data_content_count); win_info->detail.data_display_info.data_content_count);
win_info->detail.data_display_info.data_content = win_info->detail.data_display_info.data_content = NULL;
(tui_win_content) NULL;
win_info->detail.data_display_info.data_content_count = 0; win_info->detail.data_display_info.data_content_count = 0;
win_info->detail.data_display_info.regs_column_count = 1; win_info->detail.data_display_info.regs_column_count = 1;
win_info->detail.data_display_info.display_regs = FALSE; win_info->detail.data_display_info.display_regs = FALSE;
@ -808,7 +804,7 @@ free_content (tui_win_content content,
int content_size, int content_size,
enum tui_win_type win_type) enum tui_win_type win_type)
{ {
if (content != (tui_win_content) NULL) if (content != NULL)
{ {
free_content_elements (content, content_size, win_type); free_content_elements (content, content_size, win_type);
xfree (content); xfree (content);
@ -823,7 +819,7 @@ free_content_elements (tui_win_content content,
int content_size, int content_size,
enum tui_win_type type) enum tui_win_type type)
{ {
if (content != (tui_win_content) NULL) if (content != NULL)
{ {
int i; int i;

7
gdb/tui/tui-regs.c
View File

@ -237,7 +237,7 @@ tui_show_register_group (struct reggroup *group,
refresh_values_only = FALSE; refresh_values_only = FALSE;
} }
if (display_info->regs_content != (tui_win_content) NULL) if (display_info->regs_content != NULL)
{ {
if (!refresh_values_only || allocated_here) if (!refresh_values_only || allocated_here)
{ {
@ -299,7 +299,7 @@ tui_display_registers_from (int start_element_no)
{ {
struct tui_data_info *display_info = &TUI_DATA_WIN->detail.data_display_info; struct tui_data_info *display_info = &TUI_DATA_WIN->detail.data_display_info;
if (display_info->regs_content != (tui_win_content) NULL if (display_info->regs_content != NULL
&& display_info->regs_content_count > 0) && display_info->regs_content_count > 0)
{ {
int i = start_element_no; int i = start_element_no;
@ -398,8 +398,7 @@ static void
tui_display_reg_element_at_line (int start_element_no, tui_display_reg_element_at_line (int start_element_no,
int start_line_no) int start_line_no)
{ {
if (TUI_DATA_WIN->detail.data_display_info.regs_content if (TUI_DATA_WIN->detail.data_display_info.regs_content != NULL
!= (tui_win_content) NULL
&& TUI_DATA_WIN->detail.data_display_info.regs_content_count > 0) && TUI_DATA_WIN->detail.data_display_info.regs_content_count > 0)
{ {
int element_no = start_element_no; int element_no = start_element_no;

3
gdb/tui/tui-windata.c
View File

@ -138,8 +138,7 @@ tui_display_all_data (void)
tui_display_registers_from (0); tui_display_registers_from (0);
/* Then display the other data. */ /* Then display the other data. */
if (TUI_DATA_WIN->detail.data_display_info.data_content != if (TUI_DATA_WIN->detail.data_display_info.data_content != NULL
(tui_win_content) NULL
&& TUI_DATA_WIN->detail.data_display_info.data_content_count > 0) && TUI_DATA_WIN->detail.data_display_info.data_content_count > 0)
{ {
} }