From patchwork Fri Dec 21 08:13:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 70 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 77B1A60B0C for ; Fri, 21 Dec 2018 09:13:21 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0DC995A1; Fri, 21 Dec 2018 09:13:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1545380001; bh=pC0KEpu7Jy+EEnJcaL+Ctuxe97bT/luA0nxkcZpVL3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nhKH/blv4wHwNKOsyIH2yU53Uuq1vxlqC8QAV6yUwtByMsZaV2MtinRpxyt/ACiMU /n4QWvnrm0qva4kfHVmi4s0z5M3BC4xj/SUc6DR7yGQSLZbUZAfgavUYeGX8F8/wDP czNK73ReiOWXRb6rDIQpa0BjU5jcB1FGnplb7hCA= From: Kieran Bingham To: LibCamera Devel Date: Fri, 21 Dec 2018 08:13:10 +0000 Message-Id: <20181221081311.3291-5-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181221081311.3291-1-kieran.bingham@ideasonboard.com> References: <20181221081311.3291-1-kieran.bingham@ideasonboard.com> Subject: [libcamera-devel] [PATCH 4/5] utils: checkstyle: add keep-one-line-blocks X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Dec 2018 08:13:21 -0000 Enable --keep-one-line-blocks to prevent astyle from wanting to move single inlined blocks to cover 4 lines such as: - virtual int init() { return 0; } + virtual int init() + { + return 0; + } Signed-off-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- utils/checkstyle.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/checkstyle.py b/utils/checkstyle.py index 32974815048a..a40d7dec879f 100755 --- a/utils/checkstyle.py +++ b/utils/checkstyle.py @@ -29,6 +29,7 @@ astyle_options = ( '--pad-oper', '--align-pointer=name', '--align-reference=name', + '--keep-one-line-blocks', '--max-code-length=120' )