From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5195 invoked by alias); 29 Nov 2012 16:04:16 -0000 Received: (qmail 5178 invoked by uid 22791); 29 Nov 2012 16:04:15 -0000 X-SWARE-Spam-Status: No, hits=-6.6 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS,TW_RV,TW_TR,TW_XS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 29 Nov 2012 16:04:08 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qATG48xC018502 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 29 Nov 2012 11:04:08 -0500 Received: from barimba (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qATFf8Yh031803 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 29 Nov 2012 10:41:09 -0500 From: Tom Tromey To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: Re: RFC: remove xasprintf References: <87r4nd8lgo.fsf@fleche.redhat.com> <50B68FF3.8040108@redhat.com> Date: Thu, 29 Nov 2012 16:04:00 -0000 In-Reply-To: <50B68FF3.8040108@redhat.com> (Pedro Alves's message of "Wed, 28 Nov 2012 22:28:03 +0000") Message-ID: <87ehjc76y3.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-11/txt/msg00872.txt.bz2 >>>>> "Pedro" == Pedro Alves writes: Pedro> I believe we may need to tweak the ari too. Here's an update. This requires an approval from Pierre. Tom 2012-11-29 Tom Tromey * 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. diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c index ad01ed6..ef5d638 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 030bcc5..58fa3f9 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 123249e..2211f66 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"] = "\