From patchwork Fri Jan 17 03:56:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 37416 Received: (qmail 121327 invoked by alias); 17 Jan 2020 03:57:13 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 121312 invoked by uid 89); 17 Jan 2020 03:57:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy= X-HELO: caracal.birch.relay.mailchannels.net X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Stretch-Cellar: 2a35c62903bfafca_1579233429165_749060182 X-MC-Loop-Signature: 1579233429165:2047210265 X-MC-Ingress-Time: 1579233429165 X-DH-BACKEND: pdx1-sub0-mail-a10 From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [COMMITTED] vcs-to-changelog: Add quirk for __nonnull Date: Fri, 17 Jan 2020 09:26:48 +0530 Message-Id: <20200117035648.90469-1-siddhesh@sourceware.org> MIME-Version: 1.0 X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: 0 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedugedrtdeigdeivdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefuihguughhvghshhcurfhohigrrhgvkhgrrhcuoehsihguughhvghshhesshhouhhrtggvfigrrhgvrdhorhhgqeenucfkphepuddvfedrvdehvddrvddtvddrudejvdenucfrrghrrghmpehmohguvgepshhmthhppdhhvghloheplhhinhgrrhhoqdhlrghpthhophdrihhnthhrrgdrrhgvshgvrhhvvgguqdgsihhtrdgtohhmpdhinhgvthepuddvfedrvdehvddrvddtvddrudejvddprhgvthhurhhnqdhprghthhepufhiugguhhgvshhhucfrohihrghrvghkrghruceoshhiugguhhgvshhhsehsohhurhgtvgifrghrvgdrohhrgheqpdhmrghilhhfrhhomhepshhiugguhhgvshhhsehsohhurhgtvgifrghrvgdrohhrghdpnhhrtghpthhtoheplhhisggtqdgrlhhphhgrsehsohhurhgtvgifrghrvgdrohhrghenucevlhhushhtvghrufhiiigvpedt The parser cannot identify the __nonnull off the bat and confuses __typeof in the change db25266c9 to be a function declaration. --- scripts/vcs_to_changelog/vcstocl_quirks.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/vcs_to_changelog/vcstocl_quirks.py b/scripts/vcs_to_changelog/vcstocl_quirks.py index 2417e962b9..0e611ffd7d 100644 --- a/scripts/vcs_to_changelog/vcstocl_quirks.py +++ b/scripts/vcs_to_changelog/vcstocl_quirks.py @@ -39,6 +39,8 @@ class GlibcProjectQuirks(ProjectQuirks): 'sub': r'__attribute__ ((\1))'}, {'orig': r'__THROW', 'sub': r'__attribute__ ((__nothrow__ __LEAF))'}, {'orig': r'__THROWNL', 'sub': r'__attribute__ ((__nothrow__))'}, + {'orig': r'__nonnull \(\(([^)]+)\)\)', + 'sub': r'__attribute__ ((__nonnull__ \1))'}, {'orig': r'([^_])attribute_(\w+)', 'sub': r'\1__attribute__ ((\2))'}, {'orig': r'^attribute_(\w+)', 'sub': r'__attribute__ ((\1))'}]