405c410
<   gdb::unique_xmalloc_ptr<char> name (ctf_type_aname_raw (fp, tid));
---
>   char *name = ctf_type_aname_raw (fp, tid);
412c417
<       SYMBOL_SET_NAMES (sym, name.get (), strlen (name.get ()), 1, objfile);
---
>       SYMBOL_SET_NAMES (sym, name, strlen (name), 1, objfile);
414a420
>       free (name);
478,479c484,485
<   gdb::unique_xmalloc_ptr<char> copied_name (ctf_type_aname_raw (fp, tid));
<   if (copied_name == NULL || strlen (copied_name.get ()) == 0)
---
>   name = ctf_type_aname_raw (fp, tid);
>   if (name == NULL || strlen (name) == 0)
487c493,497
<     name = obstack_strdup (&of->objfile_obstack, copied_name.get ());
---
>     {
>       char *dup_name = name;
>       name = obstack_strdup (&of->objfile_obstack, name);
>       free (dup_name);
>     }
561a572
>   char *name;
566,568c577,582
<   gdb::unique_xmalloc_ptr<char> name (ctf_type_aname_raw (fp, tid));
<   if (name != NULL && strlen (name.get() ) != 0)
<     TYPE_NAME (type) = obstack_strdup (&of->objfile_obstack, name.get ());
---
>   name = ctf_type_aname_raw (fp, tid);
>   if (name != NULL && strlen (name) != 0)
>     {
>       TYPE_NAME (type) = obstack_strdup (&of->objfile_obstack, name);
>       free (name);
>     }
617c631
<   struct objfile *of = ccp->of;
---
>   struct objfile *objfile = ccp->of;
620a635
>   char *name;
622c637
<   type = alloc_type (of);
---
>   type = alloc_type (objfile);
624,626c639,644
<   gdb::unique_xmalloc_ptr<char> name (ctf_type_aname_raw (fp, tid));
<   if (name != NULL && strlen (name.get ()) != 0)
<     TYPE_NAME (type) = obstack_strdup (&of->objfile_obstack, name.get ());
---
>   name = ctf_type_aname_raw (fp, tid);
>   if (name != NULL && strlen (name) != 0)
>     {
>       TYPE_NAME (type) = obstack_strdup (&objfile->objfile_obstack, name);
>       free (name);
>     }
630c648
<   rettype = get_tid_type (of, cfi.ctc_return);
---
>   rettype = get_tid_type (objfile, cfi.ctc_return);
634c652
<   return set_tid_type (of, tid, type);
---
>   return set_tid_type (objfile, tid, type);
646a665
>   char *name;
650,652c669,674
<   gdb::unique_xmalloc_ptr<char> name (ctf_type_aname_raw (fp, tid));
<   if (name != NULL && strlen (name.get ()) != 0)
<     TYPE_NAME (type) = obstack_strdup (&of->objfile_obstack, name.get ());
---
>   name = ctf_type_aname_raw (fp, tid);
>   if (name != NULL && strlen (name) != 0)
>     {
>       TYPE_NAME (type) = obstack_strdup (&of->objfile_obstack, name);
>       free (name);
>     }
880a903
>   char *name;
903,907c926,929
< 	{ 
< 	  gdb::unique_xmalloc_ptr<char> name (ctf_type_aname_raw (fp, tid));
< 	  btid = ctf_type_reference (fp, tid);
< 	  type = read_typedef_type (ccp, tid, btid, name.get ());
< 	} 
---
> 	name = ctf_type_aname_raw (fp, tid);
> 	btid = ctf_type_reference (fp, tid);
> 	type = read_typedef_type (ccp, tid, btid, name);
> 	free (name);
1088a1111
>   char *name;
1103c1126
<   gdb::unique_xmalloc_ptr<char> name (ctf_type_aname_raw (ccp->fp, idx));
---
>   name = ctf_type_aname_raw (ccp->fp, idx);
1105a1129
>   free (name);
1321a1346
>   char *name;
1326,1327c1351,1352
<   gdb::unique_xmalloc_ptr<char> name (ctf_type_aname_raw (ccp->fp, tid));
<   if (name == NULL || strlen (name.get ()) == 0)
---
>   name = ctf_type_aname_raw (ccp->fp, tid);
>   if (name == NULL || strlen (name) == 0)
1368c1393
<     add_psymbol_to_list (name.get (), strlen (name.get ()), true,
---
>     add_psymbol_to_list (name, strlen (name), true,
1372a1398
>   free (name);
1425c1451
<       gdb::unique_xmalloc_ptr<char> tname (ctf_type_aname_raw (cfp, tid));
---
>       char *tname = ctf_type_aname_raw (cfp, tid);
1448c1474
<       add_psymbol_to_list (tname.get (), strlen (tname.get ()), true,
---
>       add_psymbol_to_list (tname, strlen (tname), true,
1451a1478
>       free (tname);