Re: [PATCH] gdb: make inferior::terminal a unique ptr

[Simon Marchi <simark@simark.ca>]

On 2020-06-25 4:15 p.m., Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
> 
> Simon> -    current_inferior ()->terminal = xstrdup (terminal_name);
> Simon> +    current_inferior ()->terminal.reset (xstrdup (terminal_name));
> 
> You can use make_unique_xstrdup and avoid the call to reset, in favor of
> move assignment.
> 
> Tom
> 

Good catch.  I pushed the following patch that does it.


From 58373b80f3d06740fccefe735fbb390791092027 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Thu, 25 Jun 2020 17:06:18 -0400
Subject: [PATCH] gdb: use make_unique_xstrdup in set_inferior_io_terminal

gdb/ChangeLog:

	* infcmd.c (set_inferior_io_terminal): Use make_unique_xstrdup.

Change-Id: I38b6e753f58947531fe4a293d574bc27ec128f47
---
 gdb/ChangeLog | 4 ++++
 gdb/infcmd.c  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d9b6a49bd105..ddb5c47d1e75 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-25  Simon Marchi  <simon.marchi@efficios.com>
+
+	* infcmd.c (set_inferior_io_terminal): Use make_unique_xstrdup.
+
 2020-06-25  Simon Marchi  <simon.marchi@efficios.com>

 	* inferior.h (struct inferior) <terminal>: Change type to
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 48d6a91c0c24..17f7b9abeac3 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -109,7 +109,7 @@ void
 set_inferior_io_terminal (const char *terminal_name)
 {
   if (terminal_name != NULL && *terminal_name != '\0')
-    current_inferior ()->terminal.reset (xstrdup (terminal_name));
+    current_inferior ()->terminal = make_unique_xstrdup (terminal_name);
   else
     current_inferior ()->terminal = NULL;
 }
-- 
2.26.2