From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXU0n-0003Wi-8O for qemu-devel@nongnu.org; Wed, 10 Aug 2016 09:57:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXU0k-0008AS-O3 for qemu-devel@nongnu.org; Wed, 10 Aug 2016 09:57:37 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXU0k-0008AK-GR for qemu-devel@nongnu.org; Wed, 10 Aug 2016 09:57:34 -0400 Received: by mail-wm0-x241.google.com with SMTP id o80so9708504wme.0 for ; Wed, 10 Aug 2016 06:57:34 -0700 (PDT) Received: from 640k.lan (94-39-152-88.adsl-ull.clienti.tiscali.it. [94.39.152.88]) by smtp.gmail.com with ESMTPSA id a9sm43257024wjf.16.2016.08.10.06.57.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 06:57:32 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 10 Aug 2016 15:57:14 +0200 Message-Id: <1470837437-14713-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1470837437-14713-1-git-send-email-pbonzini@redhat.com> References: <1470837437-14713-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 11/14] checkpatch: check for CVS keywords on all sources List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org These should apply to all files, not just C/C++. Tweak the regular expression to check for whole words, to avoid false positives on Perl variables starting with "Id". Signed-off-by: Paolo Bonzini --- scripts/checkpatch.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 082c4ce..fea576d 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1354,6 +1354,11 @@ sub process { WARN("adding a line without newline at end of file\n" . $herecurr); } +# check for RCS/CVS revision markers + if ($rawline =~ /^\+.*\$(Revision|Log|Id)(?:\$|\b)/) { + WARN("CVS style keyword markers, these will _not_ be updated\n". $herecurr); + } + # tabs are only allowed in assembly source code, and in # some scripts we imported from other projects. next if ($realfile =~ /\.(s|S)$/); @@ -1368,11 +1373,6 @@ sub process { # check we are in a valid C source file if not then ignore this hunk next if ($realfile !~ /\.(h|c|cpp)$/); -# check for RCS/CVS revision markers - if ($rawline =~ /^\+.*\$(Revision|Log|Id)(?:\$|)/) { - WARN("CVS style keyword markers, these will _not_ be updated\n". $herecurr); - } - # Check for potential 'bare' types my ($stat, $cond, $line_nr_next, $remain_next, $off_next, $realline_next); -- 1.8.3.1