[02/20] Change tui_source_element::line to be a unique_xmalloc_ptr

Message ID 20190910190857.6562-3-tom@tromey.com
State New
Headers show
Series
  • Final round of TUI refactorings
Related show

Commit Message

Tom Tromey Sept. 10, 2019, 7:08 p.m.
This changes tui_source_element::line to be a unique_xmalloc_ptr,
removing some manual memory management.

gdb/ChangeLog
2019-09-10  Tom Tromey  <tom@tromey.com>

	* tui/tui-winsource.h (~tui_source_element): Remove.
	(tui_source_element): Update.
	(struct tui_source_element) <line>: Now a unique_xmalloc_ptr.
	* 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.
---
 gdb/ChangeLog           |  9 +++++++++
 gdb/tui/tui-disasm.c    |  5 ++---
 gdb/tui/tui-source.c    |  4 +---
 gdb/tui/tui-winsource.c |  3 +--
 gdb/tui/tui-winsource.h | 10 ++--------
 5 files changed, 15 insertions(+), 16 deletions(-)

-- 
2.17.2

Patch

diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 1d019ca60c1..2a331327e77 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -231,11 +231,10 @@  tui_disasm_window::set_contents (struct gdbarch *arch,
       strcpy (line + insn_pos, asm_lines[i].insn);
 
       /* Now copy the line taking the offset into account.  */
-      xfree (src->line);
       if (strlen (line) > offset)
-	src->line = xstrndup (&line[offset], line_width);
+	src->line.reset (xstrndup (&line[offset], line_width));
       else
-	src->line = xstrdup ("");
+	src->line.reset (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 906006a4225..c379173018d 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -184,9 +184,7 @@  tui_source_window::set_contents (struct gdbarch *arch,
 				 symtab_to_fullname (s)) == 0
 		   && cur_line_no == locator->line_no);
 
-	      xfree (content[cur_line].line);
-	      content[cur_line].line
-		= xstrdup (text.c_str ());
+	      content[cur_line].line.reset (xstrdup (text.c_str ()));
 
 	      cur_line++;
 	      cur_line_no++;
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 4520a1ac3fe..d5281193c0e 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -222,8 +222,7 @@  tui_show_source_line (struct tui_source_window_base *win_info, int lineno)
     tui_set_reverse_mode (win_info->handle, true);
 
   wmove (win_info->handle, lineno, TUI_EXECINFO_SIZE);
-  tui_puts (line->line,
-	    win_info->handle);
+  tui_puts (line->line.get (), win_info->handle);
   if (line->is_exec_point)
     tui_set_reverse_mode (win_info->handle, false);
 
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index 445cc7c7357..64f0739e536 100644
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -54,23 +54,17 @@  struct tui_source_element
     line_or_addr.u.line_no = 0;
   }
 
-  ~tui_source_element ()
-  {
-    xfree (line);
-  }
-
   DISABLE_COPY_AND_ASSIGN (tui_source_element);
 
   tui_source_element (tui_source_element &&other)
-    : line (other.line),
+    : line (std::move (other.line)),
       line_or_addr (other.line_or_addr),
       is_exec_point (other.is_exec_point),
       break_mode (other.break_mode)
   {
-    other.line = nullptr;
   }
 
-  char *line = nullptr;
+  gdb::unique_xmalloc_ptr<char> line;
   struct tui_line_or_address line_or_addr;
   bool is_exec_point = false;
   tui_bp_flags break_mode = 0;