From a93478eab4c34a25032e58b173fede5d14fe823d Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 29 Nov 2012 17:23:18 +0000
Subject: [PATCH] 	* contrib/ari/gdb_ari.sh: Remove rules for xasprintf
 and 	xvasprintf. 	* common/common-utils.c (xasprintf, xvasprintf):
 Remove. 	* common/common-utils.h (xasprintf, xvasprintf): Remove.

---
 gdb/ChangeLog              |  7 +++++++
 gdb/common/common-utils.c  | 16 ----------------
 gdb/common/common-utils.h  |  7 -------
 gdb/contrib/ari/gdb_ari.sh | 20 --------------------
 4 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e552e4d3584..a20bcbab2e4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-29  Tom Tromey  <tromey@redhat.com>
+
+	* contrib/ari/gdb_ari.sh: Remove rules for xasprintf and
+	xvasprintf.
+	* common/common-utils.c (xasprintf, xvasprintf): Remove.
+	* common/common-utils.h (xasprintf, xvasprintf): Remove.
+
 2012-11-29  Jerome Guitton  <guitton@adacore.com>
 
 	* ada-lang.c (ada_is_interface_tag): New function.
diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c
index ad01ed658d8..ef5d6385afe 100644
--- a/gdb/common/common-utils.c
+++ b/gdb/common/common-utils.c
@@ -137,22 +137,6 @@ xstrvprintf (const char *format, va_list ap)
   return ret;
 }
 
-void
-xasprintf (char **ret, const char *format, ...)
-{
-  va_list args;
-
-  va_start (args, format);
-  (*ret) = xstrvprintf (format, args);
-  va_end (args);
-}
-
-void
-xvasprintf (char **ret, const char *format, va_list ap)
-{
-  (*ret) = xstrvprintf (format, ap);
-}
-
 int
 xsnprintf (char *str, size_t size, const char *format, ...)
 {
diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h
index 030bcc5305f..58fa3f98b5d 100644
--- a/gdb/common/common-utils.h
+++ b/gdb/common/common-utils.h
@@ -43,13 +43,6 @@ char *xstrprintf (const char *format, ...) ATTRIBUTE_PRINTF (1, 2);
 char *xstrvprintf (const char *format, va_list ap)
      ATTRIBUTE_PRINTF (1, 0);
 
-/* Like asprintf/vasprintf but get an internal_error if the call
-   fails.  */
-void xasprintf (char **ret, const char *format, ...)
-     ATTRIBUTE_PRINTF (2, 3);
-void xvasprintf (char **ret, const char *format, va_list ap)
-     ATTRIBUTE_PRINTF (2, 0);
-
 /* Like snprintf, but throw an error if the output buffer is too small.  */
 int xsnprintf (char *str, size_t size, const char *format, ...)
      ATTRIBUTE_PRINTF (3, 4);
diff --git a/gdb/contrib/ari/gdb_ari.sh b/gdb/contrib/ari/gdb_ari.sh
index 123249e7f0c..2211f66bdf9 100644
--- a/gdb/contrib/ari/gdb_ari.sh
+++ b/gdb/contrib/ari/gdb_ari.sh
@@ -1127,26 +1127,6 @@ Do not use vasprintf(), instead use xstrvprintf"
     fail("vasprintf")
 }
 
-BEGIN { doc["xasprintf"] = "\
-Do not use xasprintf(), instead use xstrprintf"
-    fix("xasprintf", "common/common-utils.h", 1)
-    fix("xasprintf", "common/common-utils.c", 1)
-    category["xasprintf"] = ari_regression
-}
-/(^|[^_[:alnum:]])xasprintf[[:space:]]*\(/ {
-    fail("xasprintf")
-}
-
-BEGIN { doc["xvasprintf"] = "\
-Do not use xvasprintf(), instead use xstrvprintf"
-    fix("xvasprintf", "common/common-utils.h", 1)
-    fix("xvasprintf", "common/common-utils.c", 1)
-    category["xvasprintf"] = ari_regression
-}
-/(^|[^_[:alnum:]])xvasprintf[[:space:]]*\(/ {
-    fail("xvasprintf")
-}
-
 # More generic memory operations
 
 BEGIN { doc["bzero"] = "\
-- 
2.30.2