summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-09-10 12:56:09 -0600
committerTom Tromey <tom@tromey.com>2019-09-20 13:49:12 -0600
commitf074b67ec812612637342a1647da9158a1e77de0 (patch)
treef0cdc8bf43671b2cc89c0bd9e02167fb826c18e9
parent63c4bf1922d5553edb213606270b0e2782bbe4c8 (diff)
downloadbinutils-gdb-f074b67ec812612637342a1647da9158a1e77de0.tar.gz
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 <tom@tromey.com> * 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.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/tui/tui-disasm.c2
-rw-r--r--gdb/tui/tui-source.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f69dc59ec3..402b57ab6ea 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
2019-09-20 Tom Tromey <tom@tromey.com>
+ * 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 <tom@tromey.com>
+
* tui/tui-data.c: Remove separator comments.
* tui/tui-layout.c: Remove separator comments.
* tui/tui-win.c: Remove separator comments.
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 53ea061afb6..51616bcf874 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 fa6ed7893fe..bb1013bb869 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++;