GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "lint/clang-format: set to 96 chars per line" 

This reverts commit 626ba097a2.

This change was submitted under the incorrect assumption that there was
agreement on a coding style change. There wasn't, so while the issue is
under discussion we should revert to the previous status quo.

Making clang-format honor the line length is a separate issue from
changing the line length, and can be reuploaded as a separate CL.

Change-Id: I433c82c95a897b3113cace3668cc8ce0f1ab75bf
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31916
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Julius Werner 2019-03-15 15:37:11 -07:00
parent ada45a3148
commit 0e3f7d4780
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -7,7 +7,7 @@ AllowShortIfStatementsOnASingleLine: false
IndentCaseLabels: false IndentCaseLabels: false
SortIncludes: false SortIncludes: false
ContinuationIndentWidth: 8 ContinuationIndentWidth: 8
ColumnLimit: 96 ColumnLimit: 0
AlwaysBreakBeforeMultilineStrings: true AlwaysBreakBeforeMultilineStrings: true
AllowShortLoopsOnASingleLine: false AllowShortLoopsOnASingleLine: false
AllowShortFunctionsOnASingleLine: false AllowShortFunctionsOnASingleLine: false

6
util/lint/lint-007-checkpatch
View File

@ -28,8 +28,6 @@ EXCLUDED_DIRS="^payloads/libpayload/util/kconfig\|\
^src/vendorcode\|\ ^src/vendorcode\|\
^Documentation" ^Documentation"
opts="--max-line-length 96"
# default: test src and util # default: test src and util
if [ "$1" = "" ]; then if [ "$1" = "" ]; then
INCLUDED_DIRS="src util" INCLUDED_DIRS="src util"
@ -37,7 +35,7 @@ if [ "$1" = "" ]; then
elif [ "$1" = "diff" ]; then elif [ "$1" = "diff" ]; then
args=$( echo $EXCLUDED_DIRS | \ args=$( echo $EXCLUDED_DIRS | \
sed -e 's,\\|, ,g' -e 's,\^,--exclude=,g' ) sed -e 's,\\|, ,g' -e 's,\^,--exclude=,g' )
util/lint/checkpatch.pl --quiet --no-signoff $opts $args - util/lint/checkpatch.pl --quiet --no-signoff $args -
exit $? exit $?
# Space separated list of directories to test # Space separated list of directories to test
else else
@ -51,5 +49,5 @@ FILELIST=$( git ls-files $INCLUDED_DIRS | \
grep -v $EXCLUDED_DIRS ) grep -v $EXCLUDED_DIRS )
for FILE in $FILELIST; do for FILE in $FILELIST; do
util/lint/checkpatch.pl --show-types --file --quiet $opts "$FILE" util/lint/checkpatch.pl --show-types --file --quiet "$FILE"
done done