[PATCH 63/66] Remove NULL checks before xfree

Tom Tromey
2019-06-24T18:49:01Z

A couple of spots in the TUI did a NULL check before an xfree. This
isn't necessary, and most other cases were removed from gdb a while
ago.

2019-06-23 Tom Tromey <tom@tromey.com>

* tui/tui-source.c (tui_set_source_content): Don't check before
xfree.
* tui/tui-disasm.c (tui_disassemble): Don't check before xfree.
---
gdb/ChangeLog | 6 ++++++
gdb/tui/tui-disasm.c | 6 ++----
gdb/tui/tui-source.c | 3 +--
3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index d3d53d7c607..4899b1d03cf 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -59,10 +59,8 @@ tui_disassemble (struct gdbarch *gdbarch, struct tui_asm_line *asm_lines,
/* Now construct each line. */
for (; count > 0; count--, asm_lines++)
{
- if (asm_lines->addr_string)
- xfree (asm_lines->addr_string);
- if (asm_lines->insn)
- xfree (asm_lines->insn);
+ xfree (asm_lines->addr_string);
+ xfree (asm_lines->insn);

print_address (gdbarch, pc, &gdb_dis_out);
asm_lines->addr = pc;
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index 4f82cbab2db..889b9509fec 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -163,8 +163,7 @@ tui_set_source_content (struct symtab *s,
= (struct tui_source_window_base *) TUI_SRC_WIN;
const char *s_filename = symtab_to_filename_for_display (s);

- if (TUI_SRC_WIN->title)
- xfree (TUI_SRC_WIN->title);
+ xfree (TUI_SRC_WIN->title);
TUI_SRC_WIN->title = xstrdup (s_filename);

xfree (src->fullname);
--
2.17.2