From f074b67ec812612637342a1647da9158a1e77de0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 10 Sep 2019 12:56:09 -0600 Subject: [PATCH] Use make_unique_xstrdup in TUI This changes a couple of spots in the TUI to use make_unique_xstrdup. This simplifies the code slightly. gdb/ChangeLog 2019-09-20 Tom Tromey * tui/tui-source.c (tui_source_window::set_contents): Use make_unique_xstrdup. * tui/tui-disasm.c (tui_disasm_window::set_contents): Use make_unique_xstrdup. --- gdb/ChangeLog | 7 +++++++ gdb/tui/tui-disasm.c | 2 +- gdb/tui/tui-source.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8f69dc59ec..402b57ab6e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2019-09-20 Tom Tromey + + * tui/tui-source.c (tui_source_window::set_contents): Use + make_unique_xstrdup. + * tui/tui-disasm.c (tui_disasm_window::set_contents): Use + make_unique_xstrdup. + 2019-09-20 Tom Tromey * tui/tui-data.c: Remove separator comments. diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 53ea061afb..51616bcf87 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -218,7 +218,7 @@ tui_disasm_window::set_contents (struct gdbarch *arch, if (line.size() > offset) src->line.reset (xstrndup (&line[offset], line_width)); else - src->line.reset (xstrdup ("")); + src->line = make_unique_xstrdup (""); src->line_or_addr.loa = LOA_ADDRESS; src->line_or_addr.u.addr = asm_lines[i].addr; diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index fa6ed7893f..bb1013bb86 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -183,7 +183,7 @@ tui_source_window::set_contents (struct gdbarch *arch, symtab_to_fullname (s)) == 0 && cur_line_no == locator->line_no); - content[cur_line].line.reset (xstrdup (text.c_str ())); + content[cur_line].line = make_unique_xstrdup (text.c_str ()); cur_line++; cur_line_no++;