From nobody Mon Feb 9 04:59:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559931290; cv=none; d=zoho.com; s=zohoarc; b=NwnhLVAfRFrlIB5QzAZ9/reSX71SDTKbr64ZHRYh/6YnKc2moXVbpw0CF1d8y9EM0eGmx/5T+/epsMuu0LO38kEHDwkHao49+zq+Hex35VqpExfqXqMBYMrHkmzhpAU7M9kMoRBa4xTDBBprmVskqkm3vtoonmaPBgEH9iceAGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559931290; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8rRLTm4JT85RpZVZm06jV1WseBCIRkqNaOJibKqUuVQ=; b=ADaRdHij6Netr3DBSWmcTujLBqPeVFzzgtcQwNr/S0HwQuJQo/UVKG1aMeMOkAhBKICEVEuAT7LmYtS4H38tdS7zDv8qG9o7xGqrqoDDG8Yd87TwiTtxW+CEO3zFW1/M1HvRRk9N+MxxK3/DbYTLbi3nmNiszhxhobCqYKoqx8k= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559931290602922.3432578745525; Fri, 7 Jun 2019 11:14:50 -0700 (PDT) Received: from localhost ([::1]:50106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZJNa-0008CP-Vx for importer@patchew.org; Fri, 07 Jun 2019 14:14:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54300) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZH0Q-0004JB-K5 for qemu-devel@nongnu.org; Fri, 07 Jun 2019 11:42:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZGlq-0000Tj-Ui for qemu-devel@nongnu.org; Fri, 07 Jun 2019 11:27:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37795) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZGlq-0008Le-3y for qemu-devel@nongnu.org; Fri, 07 Jun 2019 11:27:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F3B92EED2A for ; Fri, 7 Jun 2019 15:26:50 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-148.ams2.redhat.com [10.36.116.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F6EE831B7 for ; Fri, 7 Jun 2019 15:26:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0E14411385D0; Fri, 7 Jun 2019 17:26:47 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 7 Jun 2019 17:26:40 +0200 Message-Id: <20190607152646.4822-7-armbru@redhat.com> In-Reply-To: <20190607152646.4822-1-armbru@redhat.com> References: <20190607152646.4822-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 07 Jun 2019 15:26:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 06/12] scripts/clean-header-guards: Fix handling of trailing comments X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" clean-header-guards.pl fails to recognize a header guard #endif when it's followed by a // comment, or multiple comments. Fix that. Signed-off-by: Markus Armbruster Message-Id: <20190604181618.19980-3-armbru@redhat.com> --- scripts/clean-header-guards.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/clean-header-guards.pl b/scripts/clean-header-guards.pl index 5e67f1998c..f47d673ad5 100755 --- a/scripts/clean-header-guards.pl +++ b/scripts/clean-header-guards.pl @@ -103,7 +103,7 @@ sub preprocess { for my $fname (@ARGV) { my $text =3D slurp($fname); =20 - $text =3D~ m,\A(\s*\n|\s*//\N*\n|\s*/\*.*?\*/\s*\n)*|,msg; + $text =3D~ m,\A(\s*\n|\s*//\N*\n|\s*/\*.*?\*/\s*\n)*|,sg; my $pre =3D $&; unless ($text =3D~ /\G(.*\n)/g) { $text =3D~ /\G.*/; @@ -137,14 +137,16 @@ for my $fname (@ARGV) { } =20 unless ($body =3D~ m,\A((.*\n)*) - (\s*\#\s*endif\s*(/\*\s*.*\s*\*/\s*)?\n?) - (\n|\s)*\Z,x) { + ([ \t]*\#[ \t]*endif([ \t]*\N*)\n) + ((?s)(\s*\n|\s*//\N*\n|\s*/\*.*?\*/\s*\n)*) + \Z,x) { skipping($fname, "can't find end of header guard"); next; } $body =3D $1; my $line3 =3D $3; my $endif_comment =3D $4; + my $post =3D $5; =20 my $oldg =3D $guard; =20 @@ -186,14 +188,14 @@ for my $fname (@ARGV) { my $newl1 =3D "#ifndef $guard\n"; my $newl2 =3D "#define $guard\n"; my $newl3 =3D "#endif\n"; - $newl3 =3D~ s,\Z, /* $guard */, if defined $endif_comment; + $newl3 =3D~ s,\Z, /* $guard */, if $endif_comment; if ($line1 ne $newl1 or $line2 ne $newl2 or $line3 ne $newl3) { $pre =3D~ s/\n*\Z/\n\n/ if $pre =3D~ /\N/; $body =3D~ s/\A\n*/\n/; if ($opt_n) { print "$fname would be cleaned up\n" if $opt_v; } else { - unslurp($fname, "$pre$newl1$newl2$body$newl3"); + unslurp($fname, "$pre$newl1$newl2$body$newl3$post"); print "$fname cleaned up\n" if $opt_v; } } --=20 2.21.0