From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id DACCE1F8C6 for ; Sat, 7 Aug 2021 17:03:20 +0000 (UTC) Received: from localhost ([::1]:53748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCPjD-0006FU-R7 for normalperson@yhbt.net; Sat, 07 Aug 2021 13:03:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCPjA-0006Ep-07 for bug-gnulib@gnu.org; Sat, 07 Aug 2021 13:03:16 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.22]:14174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCPj8-0004mo-DY for bug-gnulib@gnu.org; Sat, 07 Aug 2021 13:03:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1628355791; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=MJpD2a5DaIJaPTfeXMT933z87xf6RLjI6bIScXXhhnI=; b=NDZ9LB4xtVs1hXaQdTtAQQ2N7cPGKoXTcT4XO20yXQGpoIhnFLf202pq/Xk9qjP3dD I7ktnOJ57NKfR4Nj3PnHBw+L5QQfnvNZ3mrgheA6yejSAzgoTrbyT8hfncfXgK2KEYnj 4dkuE2Lc+ZTCwcEhd0izlQXtnlOPb48ZyA+wE1gvUWvXIvydFlaWb2lI02CHseuB41dJ 6z/pBDvVC34Q0c/7t48V2rFHzWXlcX4NFm5n1YKG73fVwvPGFwSCRS5UIzcFE69ca1to T4btLxzod9MvOPvwnNhtKGBq2QxcDFmsweGv7oJLr6YPnrn/WnfLZyz6lFZq1JhLqjSP 8D+g== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH/DXj0JGsbh0vbrMZq" X-RZG-CLASS-ID: mo00 Received: from bruno.haible.de by smtp.strato.de (RZmta 47.31.0 DYNA|AUTH) with ESMTPSA id I0a189x77H3BFkh (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (curve X9_62_prime256v1 with 256 ECDH bits, eq. 3072 bits RSA)) (Client did not present a certificate); Sat, 7 Aug 2021 19:03:11 +0200 (CEST) From: Bruno Haible To: bug-gnulib@gnu.org Subject: argp: Improve GCC 11 allocation-deallocation checking Date: Sat, 07 Aug 2021 19:03:11 +0200 Message-ID: <2078566.irNJs6uVIT@omega> User-Agent: KMail/5.1.3 (Linux/4.4.0-210-generic; KDE/5.18.0; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Received-SPF: none client-ip=85.215.255.22; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" 2021-08-07 Bruno Haible argp: Improve GCC 11 allocation-deallocation checking. * lib/argp-fmtstream.h (__argp_fmtstream_free, argp_fmtstream_free): Move declarations up. (__argp_make_fmtstream): Declare that deallocation must happen through '__argp_fmtstream_free'. (argp_make_fmtstream): Declare that deallocation must happen through 'argp_fmtstream_free'. diff --git a/lib/argp-fmtstream.h b/lib/argp-fmtstream.h index 79ba484..3384a00 100644 --- a/lib/argp-fmtstream.h +++ b/lib/argp-fmtstream.h @@ -95,6 +95,10 @@ struct argp_fmtstream typedef struct argp_fmtstream *argp_fmtstream_t; +/* Flush __FS to its stream, and free it (but don't close the stream). */ +extern void __argp_fmtstream_free (argp_fmtstream_t __fs); +extern void argp_fmtstream_free (argp_fmtstream_t __fs); + /* Return an argp_fmtstream that outputs to STREAM, and which prefixes lines written on it with LMARGIN spaces and limits them to RMARGIN columns total. If WMARGIN >= 0, words that extend past RMARGIN are wrapped by @@ -104,15 +108,13 @@ typedef struct argp_fmtstream *argp_fmtstream_t; extern argp_fmtstream_t __argp_make_fmtstream (FILE *__stream, size_t __lmargin, size_t __rmargin, - ssize_t __wmargin); + ssize_t __wmargin) + _GL_ATTRIBUTE_DEALLOC (__argp_fmtstream_free, 1); extern argp_fmtstream_t argp_make_fmtstream (FILE *__stream, size_t __lmargin, size_t __rmargin, - ssize_t __wmargin); - -/* Flush __FS to its stream, and free it (but don't close the stream). */ -extern void __argp_fmtstream_free (argp_fmtstream_t __fs); -extern void argp_fmtstream_free (argp_fmtstream_t __fs); + ssize_t __wmargin) + _GL_ATTRIBUTE_DEALLOC (argp_fmtstream_free, 1); extern ssize_t __argp_fmtstream_printf (argp_fmtstream_t __fs, const char *__fmt, ...)