[{"id":18112,"web_url":"https://patchwork.libcamera.org/comment/18112/","msgid":"<36fb8004-18de-5ee4-805b-d259ba8239c5@ideasonboard.com>","date":"2021-07-12T13:29:25","subject":"Re: [libcamera-devel] [PATCH 02/30] cam: options: Move Option\n\tstruct to options.cpp","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 07/07/2021 03:19, Laurent Pinchart wrote:\n> The Option structure is an internal implementation detail and shouldn't\n> be exposed in the API. Move it to options.cpp. This requires moving the\n> inline constructors and destructors for the KeyValueParser and\n> OptionsParser classes to options.cpp as well, as they need a full\n> definition of the Option structure.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/cam/options.cpp | 21 +++++++++++++++++++++\n> src/cam/options.h | 22 ++++++----------------\n> 2 files changed, 27 insertions(+), 16 deletions(-)\n> \n> diff --git a/src/cam/options.cpp b/src/cam/options.cpp\n> index 417c3ab49bc9..41968caa0ccb 100644\n> --- a/src/cam/options.cpp\n> +++ b/src/cam/options.cpp\n> @@ -17,6 +17,21 @@\n> * Option\n> */\n> \n> +struct Option {\n> +\tint opt;\n> +\tOptionType type;\n> +\tconst char *name;\n> +\tOptionArgument argument;\n> +\tconst char *argumentName;\n> +\tconst char *help;\n> +\tKeyValueParser *keyValueParser;\n> +\tbool isArray;\n> +\n> +\tbool hasShortOption() const { return isalnum(opt); }\n> +\tbool hasLongOption() const { return name != nullptr; }\n> +\tconst char *typeName() const;\n> +};\n> +\n> const char *Option::typeName() const\n> {\n> \tswitch (type) {\n> @@ -129,6 +144,9 @@ template class OptionsBase;\n> * KeyValueParser\n> */\n> \n> +KeyValueParser::KeyValueParser() = default;\n> +KeyValueParser::~KeyValueParser() = default;\n> +\n> bool KeyValueParser::addOption(const char *name, OptionType type,\n> \t\t\t const char *help, OptionArgument argument)\n> {\n> @@ -349,6 +367,9 @@ std::vector OptionValue::toArray() const\n> * OptionsParser\n> */\n> \n> +OptionsParser::OptionsParser() = default;\n> +OptionsParser::~OptionsParser() = default;\n> +\n> bool OptionsParser::addOption(int opt, OptionType type, const char *help,\n> \t\t\t const char *name, OptionArgument argument,\n> \t\t\t const char *argumentName, bool array)\n> diff --git a/src/cam/options.h b/src/cam/options.h\n> index d0defb4bd665..688fe26011f8 100644\n> --- a/src/cam/options.h\n> +++ b/src/cam/options.h\n> @@ -14,6 +14,7 @@\n> \n> class KeyValueParser;\n> class OptionValue;\n> +struct Option;\n> \n> enum OptionArgument {\n> \tArgumentNone,\n> @@ -28,21 +29,6 @@ enum OptionType {\n> \tOptionKeyValue,\n> };\n> \n> -struct Option {\n> -\tint opt;\n> -\tOptionType type;\n> -\tconst char *name;\n> -\tOptionArgument argument;\n> -\tconst char *argumentName;\n> -\tconst char *help;\n> -\tKeyValueParser *keyValueParser;\n> -\tbool isArray;\n> -\n> -\tbool hasShortOption() const { return isalnum(opt); }\n> -\tbool hasLongOption() const { return name != nullptr; }\n> -\tconst char *typeName() const;\n> -};\n> -\n> template\n> class OptionsBase\n> {\n> @@ -73,7 +59,8 @@ public:\n> \t{\n> \t};\n> \n> -\tvirtual ~KeyValueParser() = default;\n> +\tKeyValueParser();\n> +\tvirtual ~KeyValueParser();\n> \n> \tbool addOption(const char *name, OptionType type, const char *help,\n> \t\t OptionArgument argument = ArgumentNone);\n> @@ -133,6 +120,9 @@ public:\n> \t{\n> \t};\n> \n> +\tOptionsParser();\n> +\t~OptionsParser();\n> +\n> \tbool addOption(int opt, OptionType type, const char *help,\n> \t\t const char *name = nullptr,\n> \t\t OptionArgument argument = ArgumentNone,\n>","headers":{"Return-Path":"","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 3C1B5C3226\n\tfor ;\n\tMon, 12 Jul 2021 13:29:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E9F1768524;\n\tMon, 12 Jul 2021 15:29:28 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BB68068513\n\tfor ;\n\tMon, 12 Jul 2021 15:29:27 +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 5C5EDCC;\n\tMon, 12 Jul 2021 15:29:27 +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=\"MiG4skN8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626096567;\n\tbh=IUYJJYMQf5b5HRgLAW7NfBFdWEE579Wf2LmauydkulE=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=MiG4skN8jFc1vyRuFp59kgVKs/NwGLDmjcaDOv6sCgMa/mJfNfaFPn9yqmQhCIEcv\n\tHPGXXSBcv0VXoTgYkGrVgppSdPIE0qNhSraz7wCGQkcp9xTbKEVd+G/olVI02Ig9XS\n\tMVd6e3yNOFQLBc75dDM2f6qYJ7zDC8xPsja5Luk4=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>\n\t<20210707021941.20804-3-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"<36fb8004-18de-5ee4-805b-d259ba8239c5@ideasonboard.com>","Date":"Mon, 12 Jul 2021 14:29:25 +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-3-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 02/30] cam: options: Move Option\n\tstruct to options.cpp","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]