From patchwork Sat Jan 15 17:45:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 79057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by ozlabs.org (Postfix) with ESMTP id 869D7B6EF1 for ; Sun, 16 Jan 2011 04:52:10 +1100 (EST) Received: from localhost ([127.0.0.1]:34678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PeADI-0005jR-Er for incoming@patchwork.ozlabs.org; Sat, 15 Jan 2011 12:46:56 -0500 Received: from [140.186.70.92] (port=46585 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PeAC3-00058V-6t for qemu-devel@nongnu.org; Sat, 15 Jan 2011 12:45:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PeABt-0005Ih-88 for qemu-devel@nongnu.org; Sat, 15 Jan 2011 12:45:30 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:40337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PeABs-0005IX-Rd for qemu-devel@nongnu.org; Sat, 15 Jan 2011 12:45:29 -0500 Received: by pwj6 with SMTP id 6so882897pwj.4 for ; Sat, 15 Jan 2011 09:45:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:from:date:message-id:subject:to :content-type; bh=EJPv6mKA6vWPQodvWa2GZq6jpE+1zUNFNPb0fimqOSY=; b=mI2mXTpmf2i7bkXbZgAXHYQUiCUXpEGWgNa+QsQYYYENzDibT1Gxz+3YpxOYKkkuZ7 p8vNMf4OGjBwt124y6yCmXzVqovVeoSrZO3r9V+uMX1/BVX/IdQ3kpI22MPzqI7cprga T4vPRv1OukLLhfd/6oEZckTz1O7earaOQDOn0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=mNBidYPWhIBDQdWMelWOoqHdWTFrv6gCd11cWOIF+WBSMGzWw853a8IiDDTL2YrR8P G/sL0ruw+JEsAGCdI1Dqorn7aBaY1yMG99kv8q4E18NZASYmdtO7iKNUVp/Z4o0W3j06 Kl+YnRm+qx8xrVeoye+sheHVx2kTlgBkLbiVI= Received: by 10.142.143.19 with SMTP id q19mr1858277wfd.230.1295113527649; Sat, 15 Jan 2011 09:45:27 -0800 (PST) MIME-Version: 1.0 Received: by 10.142.241.1 with HTTP; Sat, 15 Jan 2011 09:45:07 -0800 (PST) From: Blue Swirl Date: Sat, 15 Jan 2011 17:45:07 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH v2 3/3] checkpatch: adjust to QEMUisms X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Change checkpatch.pl for QEMU use: - Root directory detection - Forbid tabs - Indent at 4 spaces - Allow typedefs - Enforce brace use even for single statement blocks - Don't suggest nonexistent cleanup tools Mention the script in CODING_STYLE. Signed-off-by: Blue Swirl --- v2: fix false positives for #if directives. CODING_STYLE | 3 ++ scripts/checkpatch.pl | 64 +++++++++++++----------------------------------- 2 files changed, 21 insertions(+), 46 deletions(-) mode change 100644 => 100755 scripts/checkpatch.pl WARN("suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n"); } @@ -1869,16 +1851,6 @@ sub process { $herecurr); } -# check for new typedefs, only function parameters and sparse annotations -# make sense. - if ($line =~ /\btypedef\s/ && - $line !~ /\btypedef\s+$Type\s*\(\s*\*?$Ident\s*\)\s*\(/ && - $line !~ /\btypedef\s+$Type\s+$Ident\s*\(/ && - $line !~ /\b$typeTypedefs\b/ && - $line !~ /\b__bitwise(?:__|)\b/) { - WARN("do not add new typedefs\n" . $herecurr); - } - # * goes on variable not on type # (char*[ const]) if ($line =~ m{\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\)}) { @@ -2514,13 +2486,13 @@ sub process { WARN("vmlinux.lds.h needs VMLINUX_SYMBOL() around C-visible symbols\n" . $herecurr); } -# check for redundant bracing round if etc - if ($line =~ /(^.*)\bif\b/ && $1 !~ /else\s*$/) { +# check for missing bracing round if etc + if ($line =~ /(^.*)\bif\b/ && $line !~ /\#\s*if/) { my ($level, $endln, @chunks) = ctx_statement_full($linenr, $realcnt, 1); #print "chunks<$#chunks> linenr<$linenr> endln<$endln> level<$level>\n"; #print "APW: <<$chunks[1][0]>><<$chunks[1][1]>>\n"; - if ($#chunks > 0 && $level == 0) { + if ($#chunks >= 0 && $level == 0) { my $allowed = 0; my $seen = 0; my $herectx = $here . "\n"; @@ -2558,8 +2530,8 @@ sub process { $allowed = 1; } } - if ($seen && !$allowed) { - WARN("braces {} are not necessary for any arm of this statement\n" . $herectx); + if (!$seen) { + WARN("braces {} are necessary for all arms of this statement\n" . $herectx); } } } @@ -2605,7 +2577,7 @@ sub process { $allowed = 1; } } - if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) { + if ($level == 0 && !$block =~ /^\s*\{/ && !$allowed) { my $herectx = $here . "\n";; my $cnt = statement_rawlines($block); @@ -2613,7 +2585,7 @@ sub process { $herectx .= raw_line($linenr, $n) . "\n";; } - WARN("braces {} are not necessary for single statement blocks\n" . $herectx); + WARN("braces {} are necessary even for single statement blocks\n" . $herectx); } } @@ -2918,10 +2890,10 @@ sub process { if ($quiet == 0) { # If there were whitespace errors which cleanpatch can fix # then suggest that. - if ($rpt_cleaners) { - print "NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or\n"; - print " scripts/cleanfile\n\n"; - } +# if ($rpt_cleaners) { +# print "NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or\n"; +# print " scripts/cleanfile\n\n"; +# } } if ($clean == 1 && $quiet == 0) { diff --git a/CODING_STYLE b/CODING_STYLE index 2c8268d..5ecfa22 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -1,6 +1,9 @@ Qemu Coding Style ================= +Please use the script checkpatch.pl in the scripts directory to check +patches before submitting. + 1. Whitespace Of course, the most important aspect in any coding style is whitespace. diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl old mode 100644 new mode 100755 index 2a8a0e2..16a0822 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -328,9 +328,9 @@ sub top_of_kernel_tree { my ($root) = @_; my @tree_check = ( - "COPYING", "CREDITS", "Kbuild", "MAINTAINERS", "Makefile", - "README", "Documentation", "arch", "include", "drivers", - "fs", "init", "ipc", "kernel", "lib", "scripts", + "COPYING", "MAINTAINERS", "Makefile", + "README", "docs", "VERSION", + "vl.c" ); foreach my $check (@tree_check) { @@ -1494,31 +1494,13 @@ sub process { # check we are in a valid source file C or perl if not then ignore this hunk next if ($realfile !~ /\.(h|c|pl)$/); -# at the beginning of a line any tabs must come first and anything -# more than 8 must use tabs. - if ($rawline =~ /^\+\s* \t\s*\S/ || - $rawline =~ /^\+\s* \s*/) { +# in QEMU, no tabs are allowed + if ($rawline =~ /\t/) { my $herevet = "$here\n" . cat_vet($rawline) . "\n"; - ERROR("code indent should use tabs where possible\n" . $herevet); + ERROR("code indent should never use tabs\n" . $herevet); $rpt_cleaners = 1; } -# check for space before tabs. - if ($rawline =~ /^\+/ && $rawline =~ / \t/) { - my $herevet = "$here\n" . cat_vet($rawline) . "\n"; - WARN("please, no space before tabs\n" . $herevet); - } - -# check for spaces at the beginning of a line. -# Exceptions: -# 1) within comments -# 2) indented preprocessor commands -# 3) hanging labels - if ($rawline =~ /^\+ / && $line !~ /\+ *(?:$;|#|$Ident:)/) { - my $herevet = "$here\n" . cat_vet($rawline) . "\n"; - WARN("please, no spaces at the start of a line\n" . $herevet); - } - # check we are in a valid C source file if not then ignore this hunk next if ($realfile !~ /\.(h|c)$/); @@ -1746,7 +1728,7 @@ sub process { #print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s> cond_lines<$cond_lines> stat_real<$stat_real> stat<$stat>\n"; - if ($check && (($sindent % 8) != 0 || + if ($check && (($sindent % 4) != 0 || ($sindent <= $indent && $s ne ''))) {