From patchwork Wed Jul 7 02:19:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12819 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 4474DBD794 for ; Wed, 7 Jul 2021 02:20:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B15F968513; Wed, 7 Jul 2021 04:20:37 +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="ZtC4IZLj"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AD2CE6850C for ; Wed, 7 Jul 2021 04:20:33 +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 44CF82E4 for ; Wed, 7 Jul 2021 04:20:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1625624433; bh=Utm5q6KQgIxi3/lEAP5+l8XceFv653XIHrowNEgmRNg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZtC4IZLjN3EJzFczgAqlk8g1ovsPIBTJytt3rD9Gon7boHbjO+RR8XbmHLQh6LGwG ww6FNpOfgSClGS9981sUqU3QuozRz3gRgFpRW8eYyysT+GDXypb77teHwYz+wquRGd X8papCkJOuSAot2a2IwstHkPDmoVrbeaWAHwTnOo= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 7 Jul 2021 05:19:17 +0300 Message-Id: <20210707021941.20804-7-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707021941.20804-1-laurent.pinchart@ideasonboard.com> References: <20210707021941.20804-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 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 2f71860d0466..f4fd8973f97a 100644 --- a/src/cam/options.cpp +++ b/src/cam/options.cpp @@ -903,8 +903,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_) { @@ -924,7 +922,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