diff options
| -rw-r--r-- | CODING_STYLE | 8 | ||||
| -rwxr-xr-x | scripts/checkpatch.pl | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/CODING_STYLE b/CODING_STYLE index 3c6978f836..e7fde15003 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -31,7 +31,11 @@ Do not leave whitespace dangling off the ends of lines. 2. Line width -Lines are 80 characters; not longer. +Lines should be 80 characters; try not to make them longer. + +Sometimes it is hard to do, especially when dealing with QEMU subsystems +that use long function or symbol names. Even in that case, do not make +lines much longer than 80 characters. Rationale: - Some people like to tile their 24" screens with a 6x4 matrix of 80x24 @@ -39,6 +43,8 @@ Rationale: let them keep doing it. - Code and especially patches is much more readable if limited to a sane line length. Eighty is traditional. + - The four-space indentation makes the most common excuse ("But look + at all that white space on the left!") moot. - It is the QEMU coding style. 3. Naming diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index fea576d1b4..ba6760d4b3 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1336,12 +1336,16 @@ sub process { # check we are in a valid source file if not then ignore this hunk next if ($realfile !~ /\.(h|c|cpp|s|S|pl|py|sh)$/); -#80 column limit +#90 column limit if ($line =~ /^\+/ && !($line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) && $length > 80) { - WARN("line over 80 characters\n" . $herecurr); + if ($length > 90) { + ERROR("line over 90 characters\n" . $herecurr); + } else { + WARN("line over 80 characters\n" . $herecurr); + } } # check for spaces before a quoted newline |