[{"id":18115,"web_url":"https://patchwork.libcamera.org/comment/18115/","msgid":"<04a18b22-8217-d6dc-ddfa-660a85dde395@ideasonboard.com>","date":"2021-07-12T13:31:54","subject":"Re: [libcamera-devel] [PATCH 05/30] cam: options: Add optionName()\n\tfunction to Option structure","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> Add an Option::optionName() function that returns a string describing\n> the option name, with leading dashes. As a result,\n> OptionsParser::parseValueError() function becomes a single-line function\n> and can be inlined in its caller.\n> \n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/cam/options.cpp | 32 ++++++++++++++++++--------------\n> src/cam/options.h | 2 --\n> 2 files changed, 18 insertions(+), 16 deletions(-)\n> \n> diff --git a/src/cam/options.cpp b/src/cam/options.cpp\n> index da218c4644d3..2f71860d0466 100644\n> --- a/src/cam/options.cpp\n> +++ b/src/cam/options.cpp\n> @@ -100,6 +100,7 @@ struct Option {\n> \tbool hasShortOption() const { return isalnum(opt); }\n> \tbool hasLongOption() const { return name != nullptr; }\n> \tconst char *typeName() const;\n> +\tstd::string optionName() const;\n> };\n> \n> /**\n> @@ -125,6 +126,20 @@ const char *Option::typeName() const\n> \treturn \"unknown\";\n> }\n> \n> +/**\n> + * \\brief Retrieve a string describing the option name, with leading dashes\n> + * \\return A string describing the option name, as a long option identifier\n> + * (double dash) if the option has a name, or a short option identifier (single\n> + * dash) otherwise\n> + */\n> +std::string Option::optionName() const\n> +{\n> +\tif (name)\n> +\t\treturn \"--\" + std::string(name);\n> +\telse\n> +\t\treturn \"-\" + std::string(1, opt);\n> +}\n> +\n> /* -----------------------------------------------------------------------------\n> * OptionBase\n> */\n> @@ -866,7 +881,9 @@ OptionsParser::Options OptionsParser::parse(int argc, char **argv)\n> \n> \t\tconst Option &option = *optionsMap_[c];\n> \t\tif (!options.parseValue(c, option, optarg)) {\n> -\t\t\tparseValueError(option);\n> +\t\t\tstd::cerr << \"Can't parse \" << option.typeName()\n> +\t\t\t\t << \" argument for option \" << option.optionName()\n> +\t\t\t\t << std::endl;\n> \t\t\tusage();\n> \t\t\treturn options;\n> \t\t}\n> @@ -953,16 +970,3 @@ void OptionsParser::usage()\n> \t\t\toption.keyValueParser->usage(indent);\n> \t}\n> }\n> -\n> -void OptionsParser::parseValueError(const Option &option)\n> -{\n> -\tstd::string optionName;\n> -\n> -\tif (option.name)\n> -\t\toptionName = \"--\" + std::string(option.name);\n> -\telse\n> -\t\toptionName = \"-\" + std::string(1, option.opt);\n> -\n> -\tstd::cerr << \"Can't parse \" << option.typeName()\n> -\t\t << \" argument for option \" << optionName << std::endl;\n> -}\n> diff --git a/src/cam/options.h b/src/cam/options.h\n> index a3b18bb6c4ea..0b8bb172d184 100644\n> --- a/src/cam/options.h\n> +++ b/src/cam/options.h\n> @@ -95,8 +95,6 @@ public:\n> \tvoid usage();\n> \n> private:\n> -\tvoid parseValueError(const Option &option);\n> -\n> \tstd::list