[PATCH 2/2] Use make_unique_xstrdup in tracepoint

[Tom Tromey <tromey@adacore.com>]

This changes the tracepoint code to use make_unique_xstrdup (and
make_unique_xstrndup).  This meant changing the types of some members
of uploaded_tp -- but it seems to me that using array types there did
not add any value.
---
 gdb/tracepoint.c | 10 ++++------
 gdb/tracepoint.h | 12 ++++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index a70edaeb262..2b6fbcbf5ae 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -3414,7 +3414,7 @@ parse_tracepoint_definition (const char *line, struct uploaded_tp **utpp)
   p++;  /* skip a colon */
   if (piece == 'T')
     {
-      gdb::unique_xmalloc_ptr<char[]> cond;
+      gdb::unique_xmalloc_ptr<char> cond;
 
       enabled = (*p++ == 'E');
       p++;  /* skip a colon */
@@ -3442,9 +3442,7 @@ parse_tracepoint_definition (const char *line, struct uploaded_tp **utpp)
 	      p++;
 	      p = unpack_varlen_hex (p, &xlen);
 	      p++;  /* skip a comma */
-	      cond.reset ((char *) xmalloc (2 * xlen + 1));
-	      strncpy (&cond[0], p, 2 * xlen);
-	      cond[2 * xlen] = '\0';
+	      cond = make_unique_xstrndup (p, 2 * xlen);
 	      p += 2 * xlen;
 	    }
 	  else
@@ -3486,9 +3484,9 @@ parse_tracepoint_definition (const char *line, struct uploaded_tp **utpp)
       buf[end] = '\0';
 
       if (startswith (srctype, "at:"))
-	utp->at_string.reset (xstrdup (buf));
+	utp->at_string = make_unique_xstrdup (buf);
       else if (startswith (srctype, "cond:"))
-	utp->cond_string.reset (xstrdup (buf));
+	utp->cond_string = make_unique_xstrdup (buf);
       else if (startswith (srctype, "cmd:"))
 	utp->cmd_strings.emplace_back (xstrdup (buf));
     }
diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index 8503789a14b..247723aa7ee 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -177,21 +177,21 @@ struct uploaded_tp
   int orig_size = 0;
 
   /* String that is the encoded form of the tracepoint's condition.  */
-  gdb::unique_xmalloc_ptr<char[]> cond;
+  gdb::unique_xmalloc_ptr<char> cond;
 
   /* Vectors of strings that are the encoded forms of a tracepoint's
      actions.  */
-  std::vector<gdb::unique_xmalloc_ptr<char[]>> actions;
-  std::vector<gdb::unique_xmalloc_ptr<char[]>> step_actions;
+  std::vector<gdb::unique_xmalloc_ptr<char>> actions;
+  std::vector<gdb::unique_xmalloc_ptr<char>> step_actions;
 
   /* The original string defining the location of the tracepoint.  */
-  gdb::unique_xmalloc_ptr<char[]> at_string;
+  gdb::unique_xmalloc_ptr<char> at_string;
 
   /* The original string defining the tracepoint's condition.  */
-  gdb::unique_xmalloc_ptr<char[]> cond_string;
+  gdb::unique_xmalloc_ptr<char> cond_string;
 
   /* List of original strings defining the tracepoint's actions.  */
-  std::vector<gdb::unique_xmalloc_ptr<char[]>> cmd_strings;
+  std::vector<gdb::unique_xmalloc_ptr<char>> cmd_strings;
 
   /* The tracepoint's current hit count.  */
   int hit_count = 0;

-- 
2.52.0