From: Tom Tromey <tom@tromey.com>
Date: Wed, 21 Mar 2018 22:59:28 +0000 (-0600)
Subject: Remove some cleanups from record-full.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a2b2bc12af45f48617729c1413a1a01c0ee957ca;p=binutils-gdb.git

Remove some cleanups from record-full.c

This removes some cleanups from record-full.c in a straightforward
way.

Tested by the buildbot.

gdb/ChangeLog
2018-03-22  Tom Tromey  <tom@tromey.com>

	* record-full.c (record_full_exec_insn): Use gdb::byte_vector.
	(record_full_goto_bookmark): Use std::string.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ef113613560..8c875892b3f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-22  Tom Tromey  <tom@tromey.com>
+
+	* record-full.c (record_full_exec_insn): Use gdb::byte_vector.
+	(record_full_goto_bookmark): Use std::string.
+
 2018-03-22  Pedro Franco de Carvalho  <pedromfc@linux.vnet.ibm.com>
 
 	PR tdep/18295
diff --git a/gdb/record-full.c b/gdb/record-full.c
index abaf99bab93..4d8dd61bcaa 100644
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -702,8 +702,7 @@ record_full_exec_insn (struct regcache *regcache,
 	/* Nothing to do if the entry is flagged not_accessible.  */
         if (!entry->u.mem.mem_entry_not_accessible)
           {
-            gdb_byte *mem = (gdb_byte *) xmalloc (entry->u.mem.len);
-            struct cleanup *cleanup = make_cleanup (xfree, mem);
+	    gdb::byte_vector mem (entry->u.mem.len);
 
             if (record_debug > 1)
               fprintf_unfiltered (gdb_stdlog,
@@ -714,7 +713,8 @@ record_full_exec_insn (struct regcache *regcache,
                                   entry->u.mem.len);
 
             if (record_read_memory (gdbarch,
-				    entry->u.mem.addr, mem, entry->u.mem.len))
+				    entry->u.mem.addr, mem.data (),
+				    entry->u.mem.len))
 	      entry->u.mem.mem_entry_not_accessible = 1;
             else
               {
@@ -731,7 +731,7 @@ record_full_exec_insn (struct regcache *regcache,
                   }
                 else
 		  {
-		    memcpy (record_full_get_loc (entry), mem,
+		    memcpy (record_full_get_loc (entry), mem.data (),
 			    entry->u.mem.len);
 
 		    /* We've changed memory --- check if a hardware
@@ -748,8 +748,6 @@ record_full_exec_insn (struct regcache *regcache,
 		      record_full_stop_reason = TARGET_STOPPED_BY_WATCHPOINT;
 		  }
               }
-
-	    do_cleanups (cleanup);
           }
       }
       break;
@@ -1750,28 +1748,22 @@ record_full_goto_bookmark (struct target_ops *self,
 			   const gdb_byte *raw_bookmark, int from_tty)
 {
   const char *bookmark = (const char *) raw_bookmark;
-  struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
 
   if (record_debug)
     fprintf_unfiltered (gdb_stdlog,
 			"record_full_goto_bookmark receives %s\n", bookmark);
 
+  std::string name_holder;
   if (bookmark[0] == '\'' || bookmark[0] == '\"')
     {
-      char *copy;
-
       if (bookmark[strlen (bookmark) - 1] != bookmark[0])
 	error (_("Unbalanced quotes: %s"), bookmark);
 
-
-      copy = savestring (bookmark + 1, strlen (bookmark) - 2);
-      make_cleanup (xfree, copy);
-      bookmark = copy;
+      name_holder = std::string (bookmark + 1, strlen (bookmark) - 2);
+      bookmark = name_holder.c_str ();
     }
 
   record_goto (bookmark);
-
-  do_cleanups (cleanup);
 }
 
 static enum exec_direction_kind