From patchwork Mon Jul 12 21:56:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12919 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 94B70C3227 for ; Mon, 12 Jul 2021 21:57:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E8BC06854D; Mon, 12 Jul 2021 23:57:43 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="LBBERBbo"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DBE8C68524 for ; Mon, 12 Jul 2021 23:57:37 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7E0DDCC for ; Mon, 12 Jul 2021 23:57:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626127057; bh=B9fjfrSkPUoFdIP3KHkYWUVgzaDolzIhMIlVMa91eRI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=LBBERBboStiMVkKNoxSbKZD9oyKRasNvicgqFzd0rjJSivtIp4Fgv+9XYelOxQfWi Bg3FvV0eyVLBbGnyP1IbC4PcrwOhHWFW2GqlNOg/HnmpGupf7XCagiK/8r7aG0sdQi mdlUIDGUepAWItChcw5YCrjaHIVhntAcbw4wNuWI= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 13 Jul 2021 00:56:21 +0300 Message-Id: <20210712215645.30478-7-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210712215645.30478-1-laurent.pinchart@ideasonboard.com> References: <20210712215645.30478-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 06/30] cam: options: Slit OptionsParser::usage() in two functions 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" To prepare for code reuse, split the printing of options out of OptionsParser::usage() to a separate function. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/options.cpp | 12 +++++++++--- src/cam/options.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/cam/options.cpp b/src/cam/options.cpp index 721a808ac859..350c8084f75f 100644 --- a/src/cam/options.cpp +++ b/src/cam/options.cpp @@ -902,8 +902,6 @@ OptionsParser::Options OptionsParser::parse(int argc, char **argv) */ void OptionsParser::usage() { - std::cerr << "Options:" << std::endl; - unsigned int indent = 0; for (const Option &option : options_) { @@ -923,7 +921,15 @@ void OptionsParser::usage() indent = (indent + 7) / 8 * 8; - for (const Option &option : options_) { + std::cerr << "Options:" << std::endl; + + usageOptions(options_, indent); +} + +void OptionsParser::usageOptions(const std::list