Delete temporary string within demangler even in failure cases.

[deliverable/binutils-gdb.git] / libiberty / asprintf.c

diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c
index cd0543aa7ad40a78df65088a503f8677146677fb..961ad4dbb002edad88b4feb3a53eb73f8ca14800 100644 (file)
--- a/libiberty/asprintf.c
+++ b/libiberty/asprintf.c
@@ -1,6 +1,6 @@
 /* Like sprintf but provides a pointer to malloc'd storage, which must
    be freed by the caller.
 /* Like sprintf but provides a pointer to malloc'd storage, which must
    be freed by the caller.

-   Copyright (C) 1997, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2003, 2013 Free Software Foundation, Inc.

    Contributed by Cygnus Solutions.
 
 This file is part of the libiberty library.
    Contributed by Cygnus Solutions.
 
 This file is part of the libiberty library.


@@ -16,17 +16,16 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with libiberty; see the file COPYING.LIB.  If
 
 You should have received a copy of the GNU Library General Public
 License along with libiberty; see the file COPYING.LIB.  If

-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

 #include "ansidecl.h"
 #include "libiberty.h"
 
 #include "ansidecl.h"
 #include "libiberty.h"
 

-#ifdef ANSI_PROTOTYPES

 #include <stdarg.h>
 #include <stdarg.h>

-#else
-#include <varargs.h>
-#endif

 
 /*
 
 
 /*
 


@@ -45,13 +44,12 @@ not be allocated, minus one is returned and @code{NULL} is stored in
 */
 
 int
 */
 
 int

-asprintf VPARAMS ((char **buf, const char *fmt, ...))
+asprintf (char **buf, const char *fmt, ...)

 {
   int status;
 {
   int status;

-  VA_OPEN (ap, fmt);
-  VA_FIXEDARG (ap, char **, buf);
-  VA_FIXEDARG (ap, const char *, fmt);
+  va_list ap;
+  va_start (ap, fmt);

   status = vasprintf (buf, fmt, ap);
   status = vasprintf (buf, fmt, ap);

-  VA_CLOSE (ap);
+  va_end (ap);

   return status;
 }
   return status;
 }