From: Pierre Muller <muller@sourceware.org>
Date: Thu, 15 Nov 2012 08:31:23 +0000 (+0000)
Subject: 	ARI xasprintf rule fixes.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2792b94d6b9ffb46c239ccb871119b41e449ed03;p=binutils-gdb.git

	ARI xasprintf rule fixes.
	* dwarf2read.c (create_dwo_in_dwp): Use xstrprintf function
	instead of xasprintf.
	(open_and_init_dwp_file): Ditto.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 785160d3374..12dbce20cba 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-15  Pierre Muller  <muller@sourceware.org>
+
+	ARI xasprintf rule fixes.
+	* dwarf2read.c (create_dwo_in_dwp): Use xstrprintf function
+	instead of xasprintf.
+	(open_and_init_dwp_file): Ditto.
+
 2012-11-14  Luis Machado  <lgustavo@codesourcery.com>
 
 	* value.c (value_actual_type): Check for TYPE_CODE_STRUCT
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 8cdecdec642..078eb500b04 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -8610,13 +8610,14 @@ create_dwo_in_dwp (struct dwp_file *dwp_file,
      (fewer struct dwo_file objects to allocated).  Remember that for really
      large apps there can be on the order of 8K CUs and 200K TUs, or more.  */
 
-  xasprintf (&virtual_dwo_name, "virtual-dwo/%d-%d-%d-%d",
-	     sections.abbrev.asection ? sections.abbrev.asection->id : 0,
-	     sections.line.asection ? sections.line.asection->id : 0,
-	     sections.loc.asection ? sections.loc.asection->id : 0,
-	     (sections.str_offsets.asection
-	      ? sections.str_offsets.asection->id
-	      : 0));
+  virtual_dwo_name =
+    xstrprintf ("virtual-dwo/%d-%d-%d-%d",
+		sections.abbrev.asection ? sections.abbrev.asection->id : 0,
+		sections.line.asection ? sections.line.asection->id : 0,
+		sections.loc.asection ? sections.loc.asection->id : 0,
+		(sections.str_offsets.asection
+		? sections.str_offsets.asection->id
+		: 0));
   make_cleanup (xfree, virtual_dwo_name);
   /* Can we use an existing virtual DWO file?  */
   dwo_file_slot = lookup_dwo_file_slot (virtual_dwo_name);
@@ -8982,7 +8983,7 @@ open_and_init_dwp_file (const char *comp_dir)
   bfd *dbfd;
   struct cleanup *cleanups;
 
-  xasprintf (&dwp_name, "%s.dwp", dwarf2_per_objfile->objfile->name);
+  dwp_name = xstrprintf ("%s.dwp", dwarf2_per_objfile->objfile->name);
   cleanups = make_cleanup (xfree, dwp_name);
 
   dbfd = open_dwop_file (dwp_name, comp_dir, 1);