[{"id":18116,"web_url":"https://patchwork.libcamera.org/comment/18116/","msgid":"<32e4460d-a25a-0527-c853-d4c3ea84745d@ideasonboard.com>","date":"2021-07-12T13:33:31","subject":"Re: [libcamera-devel] [PATCH 06/30] cam: options: Slit\n\tOptionsParser::usage() in two functions","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"In $SUBJECT : s/Slit/Split/\n\nOn 07/07/2021 03:19, Laurent Pinchart wrote:\n> To prepare for code reuse, split the printing of options out of\n> OptionsParser::usage() to a separate function.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  src/cam/options.cpp | 12 +++++++++---\n>  src/cam/options.h   |  2 ++\n>  2 files changed, 11 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/cam/options.cpp b/src/cam/options.cpp\n> index 2f71860d0466..f4fd8973f97a 100644\n> --- a/src/cam/options.cpp\n> +++ b/src/cam/options.cpp\n> @@ -903,8 +903,6 @@ OptionsParser::Options OptionsParser::parse(int argc, char **argv)\n>   */\n>  void OptionsParser::usage()\n>  {\n> -\tstd::cerr << \"Options:\" << std::endl;\n> -\n>  \tunsigned int indent = 0;\n>  \n>  \tfor (const Option &option : options_) {\n> @@ -924,7 +922,15 @@ void OptionsParser::usage()\n>  \n>  \tindent = (indent + 7) / 8 * 8;\n>  \n> -\tfor (const Option &option : options_) {\n> +\tstd::cerr << \"Options:\" << std::endl;\n> +\n> +\tusageOptions(options_, indent);\n> +}\n> +\n> +void OptionsParser::usageOptions(const std::list<Option> &options,\n> +\t\t\t\t unsigned int indent)\n> +{\n> +\tfor (const Option &option : options) {\n>  \t\tstd::string argument;\n>  \t\tif (option.hasShortOption())\n>  \t\t\targument = std::string(\"  -\")\n> diff --git a/src/cam/options.h b/src/cam/options.h\n> index 0b8bb172d184..01a5d36a63fb 100644\n> --- a/src/cam/options.h\n> +++ b/src/cam/options.h\n> @@ -95,6 +95,8 @@ public:\n>  \tvoid usage();\n>  \n>  private:\n> +\tvoid usageOptions(const std::list<Option> &options, unsigned int indent);\n> +\n>  \tstd::list<Option> options_;\n>  \tstd::map<unsigned int, Option *> optionsMap_;\n>  };\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 73A24C3225\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 12 Jul 2021 13:33:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2FC3968524;\n\tMon, 12 Jul 2021 15:33:35 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5B33068513\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 12 Jul 2021 15:33:34 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0D723CC;\n\tMon, 12 Jul 2021 15:33:34 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"KKqMhpHW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626096814;\n\tbh=mDoRti70HifEkMifFS5Zj+fyqw/iYzpiLwTmPLO/ASc=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=KKqMhpHWm8agDc4lRNAv0BJ+se5eUNFy3cyNcuPfnMQ8HiAotzG9jXPzTejOQX8LK\n\t85wOjEDQx75WphY2cDXeI/sdb8YvC+WVhyFvy7xq+LN8YGpr3/wyq72vFQFh8w14dH\n\tWTbMX3JIdPGa4qUqMtao+OD08AQdCPQEKIMKmEXM=","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>\n\t<20210707021941.20804-7-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<32e4460d-a25a-0527-c853-d4c3ea84745d@ideasonboard.com>","Date":"Mon, 12 Jul 2021 14:33:31 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"<20210707021941.20804-7-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 06/30] cam: options: Slit\n\tOptionsParser::usage() in two functions","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]