From patchwork Fri May 31 12:18:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 20167 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 40DBBC32C8 for ; Fri, 31 May 2024 12:19:00 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A08EC634BF; Fri, 31 May 2024 14:18:59 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="pSYUZMUf"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1B8EF61A46 for ; Fri, 31 May 2024 14:18:55 +0200 (CEST) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2294F11A3 for ; Fri, 31 May 2024 14:18:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1717157930; bh=SUPECAxwvJDvRobZb/B9YJ9K3KpS0L2nzLsr6y8W1Wo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=pSYUZMUf9nt60Izzy79OqQj/tByYrcjQTpUuGBj1fl/igC86FoaZHIb3N1vmor8N4 rJctmcABHjpq5ca3kYSAamt/9Q+uDWAOSbwyKHHgbLykQQ89H/XXVVaiQmn/Qr6efL hBxLf5jfA12vXH1YKzaY6klB0DX7ixiMuSKwDtLs= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH 2/4] utils: checkstyle.py: Extend IncludeChecker to cover math.h Date: Fri, 31 May 2024 15:18:36 +0300 Message-ID: <20240531121838.27643-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240531121838.27643-1-laurent.pinchart@ideasonboard.com> References: <20240531121838.27643-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" math.h is an exception to the C compatibility header rule, as we prefer using cmath. Extend the IncludeCheck to warn about it. Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham Tested-by: Milan Zamazal --- utils/checkstyle.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/utils/checkstyle.py b/utils/checkstyle.py index 518be0897db5..f3604299de94 100755 --- a/utils/checkstyle.py +++ b/utils/checkstyle.py @@ -568,7 +568,7 @@ class IncludeChecker(StyleChecker): headers = ('cassert', 'cctype', 'cerrno', 'cfenv', 'cfloat', 'cinttypes', 'climits', 'clocale', 'csetjmp', 'csignal', 'cstdarg', 'cstddef', 'cstdint', 'cstdio', 'cstdlib', 'cstring', 'ctime', 'cuchar', - 'cwchar', 'cwctype') + 'cwchar', 'cwctype', 'math.h') include_regex = re.compile(r'^#include <([a-z.]*)>') def __init__(self, content): @@ -588,9 +588,15 @@ class IncludeChecker(StyleChecker): if header not in IncludeChecker.headers: continue - header = header[1:] + '.h' + if header.endswith('.h'): + header_type = 'C++' + header = 'c' + header[:-2] + else: + header_type = 'C compatibility' + header = header[1:] + '.h' + issues.append(StyleIssue(line_number, line, - 'C compatibility header <%s> is preferred' % header)) + f'{header_type} header <{header}> is preferred')) return issues