From 0e3f7d47804d39912faec5a56bc9cddf91ea354b Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 15 Mar 2019 15:37:11 -0700 Subject: [PATCH] Revert "lint/clang-format: set to 96 chars per line" This reverts commit 626ba097a2cd1c87800a2154420829b09803467e. 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/31916 Tested-by: build bot (Jenkins) --- .clang-format | 2 +- util/lint/lint-007-checkpatch | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.clang-format b/.clang-format index 5c8aa3c439..d853f50480 100644 --- a/.clang-format +++ b/.clang-format @@ -7,7 +7,7 @@ AllowShortIfStatementsOnASingleLine: false IndentCaseLabels: false SortIncludes: false ContinuationIndentWidth: 8 -ColumnLimit: 96 +ColumnLimit: 0 AlwaysBreakBeforeMultilineStrings: true AllowShortLoopsOnASingleLine: false AllowShortFunctionsOnASingleLine: false diff --git a/util/lint/lint-007-checkpatch b/util/lint/lint-007-checkpatch index a7b63e8d7c..afa593e3b0 100755 --- a/util/lint/lint-007-checkpatch +++ b/util/lint/lint-007-checkpatch @@ -28,8 +28,6 @@ EXCLUDED_DIRS="^payloads/libpayload/util/kconfig\|\ ^src/vendorcode\|\ ^Documentation" -opts="--max-line-length 96" - # default: test src and util if [ "$1" = "" ]; then INCLUDED_DIRS="src util" @@ -37,7 +35,7 @@ if [ "$1" = "" ]; then elif [ "$1" = "diff" ]; then args=$( echo $EXCLUDED_DIRS | \ 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 $? # Space separated list of directories to test else @@ -51,5 +49,5 @@ FILELIST=$( git ls-files $INCLUDED_DIRS | \ grep -v $EXCLUDED_DIRS ) 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