Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756858AbdLPOnq (ORCPT ); Sat, 16 Dec 2017 09:43:46 -0500 Received: from aserp2120.oracle.com ([141.146.126.78]:37642 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753577AbdLPOnk (ORCPT ); Sat, 16 Dec 2017 09:43:40 -0500 From: Knut Omang To: linux-kernel@vger.kernel.org Cc: Knut Omang , Joe Perches , Andy Whitcroft Subject: [PATCH v2 3/5] checkpatch: Improve --fix-inplace for TABSTOP Date: Sat, 16 Dec 2017 15:42:28 +0100 Message-Id: <054ce1000f13fb321b84ac474957a759633e5a9d.1513430008.git-series.knut.omang@oracle.com> X-Mailer: git-send-email 2.13.6 MIME-Version: 1.0 In-Reply-To: References: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8746 signatures=668648 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=568 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712160223 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1595 Lines: 37 If the --fix-inplace option for TABSTOP encounters a sitation with several spaces (but less than 8) at the end of an indentation, it will assume that there are extra indentation and align back to the nearest tabstop instead of the next. This might go undetected in a "full" checkpatch --fix-inplace run, as this potential new error will be handled by SUSPECT_CODE_INDENT further down in the script. The code for TABSTOP have limited "knowledge" of the previous line. Adding complexity when it is taken care of later anyway is maybe unnecessary/undesired. As a simple heuristics just use a "natural" rounding algorithm and round up for 4 spaces or more. There's an example in line 108 in net/rds/ib_recv.c with indentation TAB + 7 spaces where the correct would have been an additional TAB. With only TABSTOP enabled, checkpatch will fix this to a single TAB, which is visually worse IMO. Reported-by: Håkon Bugge Signed-off-by: Knut Omang Reviewed-by: Håkon Bugge --- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 040aa79..febe010 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2989,7 +2989,7 @@ sub process { if (WARN("TABSTOP", "Statements should start on a tabstop\n" . $herecurr) && $fix) { - $fixed[$fixlinenr] =~ s@(^\+\t+) +@$1 . "\t" x ($indent/8)@e; + $fixed[$fixlinenr] =~ s@(^\+\t+) +@$1 . "\t" x (($indent+4)/8)@e; } } } -- git-series 0.9.1