aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/tui/tui-disasm.c6
-rw-r--r--gdb/tui/tui-source.c2
-rw-r--r--gdb/tui/tui-winsource.c2
-rw-r--r--gdb/tui/tui-winsource.h2
5 files changed, 14 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index efa66ee..0c05afe 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2019-11-05 Tom Tromey <tom@tromey.com>
+
+ * tui/tui-winsource.h (struct tui_source_element) <line>: Now a
+ std::string.
+ * tui/tui-winsource.c (tui_show_source_line): Update.
+ * tui/tui-source.c (tui_source_window::set_contents): Update.
+ * tui/tui-disasm.c (tui_disasm_window::set_contents): Update.
+
2019-11-05 Christian Biesinger <cbiesinger@google.com>
* symtab.h (gdb_static_assert): Put && operator at the beginning
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 33a3ba1..91c9845 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -216,10 +216,10 @@ tui_disasm_window::set_contents (struct gdbarch *arch,
+ asm_lines[i].insn);
/* Now copy the line taking the offset into account. */
- if (line.size() > offset)
- src->line.reset (xstrndup (&line[offset], line_width));
+ if (line.size () > offset)
+ src->line = line.substr (offset, line_width);
else
- src->line = make_unique_xstrdup ("");
+ src->line.clear ();
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 bb1013b..f956645 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 = make_unique_xstrdup (text.c_str ());
+ content[cur_line].line = std::move (text);
cur_line++;
cur_line_no++;
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 3fbc49f..5d0bcb4 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -222,7 +222,7 @@ tui_show_source_line (struct tui_source_window_base *win_info, int lineno)
tui_set_reverse_mode (win_info->handle.get (), true);
wmove (win_info->handle.get (), lineno, TUI_EXECINFO_SIZE);
- tui_puts (line->line.get (), win_info->handle.get ());
+ tui_puts (line->line.c_str (), win_info->handle.get ());
if (line->is_exec_point)
tui_set_reverse_mode (win_info->handle.get (), false);
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index 9417b28..185d3dd 100644
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -62,7 +62,7 @@ struct tui_source_element
{
}
- gdb::unique_xmalloc_ptr<char> line;
+ std::string line;
struct tui_line_or_address line_or_addr;
bool is_exec_point = false;
tui_bp_flags break_mode = 0;