[{"id":718,"web_url":"https://patchwork.libcamera.org/comment/718/","msgid":"<20190131100745.GG4197@pendragon.ideasonboard.com>","date":"2019-01-31T10:07:45","subject":"Re: [libcamera-devel] [PATCH 3/6] cam: options: return if\n\taddOption() succeeds or not","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Mon, Jan 28, 2019 at 01:41:06AM +0100, Niklas Söderlund wrote:\n> To later extend the options handling to cover subparsing of arguments it\n> will be needed to know if the addition of the option itself was\n> successful or not. The information is already present in addOption()\n> this change just makes it available.\n> \n> Signed-off-by: Niklas Söderlund \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/cam/options.cpp | 11 ++++++-----\n> src/cam/options.h | 2 +-\n> 2 files changed, 7 insertions(+), 6 deletions(-)\n> \n> diff --git a/src/cam/options.cpp b/src/cam/options.cpp\n> index b24964a8ce413a85..c9ca017b4cf3fa3d 100644\n> --- a/src/cam/options.cpp\n> +++ b/src/cam/options.cpp\n> @@ -12,7 +12,7 @@\n> \n> #include \"options.h\"\n> \n> -void OptionsParser::addOption(int opt, const char *help, const char *name,\n> +bool OptionsParser::addOption(int opt, const char *help, const char *name,\n> \t\t\t OptionArgument argument, const char *argumentName)\n> {\n> \t/*\n> @@ -20,18 +20,19 @@ void OptionsParser::addOption(int opt, const char *help, const char *name,\n> \t * If an argument is accepted, it must be described by argumentName.\n> \t */\n> \tif (!isalnum(opt) && !name)\n> -\t\treturn;\n> +\t\treturn false;\n> \tif (!help || help[0] == '\\0')\n> -\t\treturn;\n> +\t\treturn false;\n> \tif (argument != ArgumentNone && !argumentName)\n> -\t\treturn;\n> +\t\treturn false;\n> \n> \t/* Reject duplicate options. */\n> \tif (optionsMap_.find(opt) != optionsMap_.end())\n> -\t\treturn;\n> +\t\treturn false;\n> \n> \toptions_.push_back(Option({ opt, name, argument, argumentName, help }));\n> \toptionsMap_[opt] = &options_.back();\n> +\treturn true;\n> }\n> \n> OptionsParser::Options OptionsParser::parse(int argc, char **argv)\n> diff --git a/src/cam/options.h b/src/cam/options.h\n> index a08bfea1ba74c96b..dfb7fcc9f6fa3324 100644\n> --- a/src/cam/options.h\n> +++ b/src/cam/options.h\n> @@ -38,7 +38,7 @@ public:\n> \t{\n> \t};\n> \n> -\tvoid addOption(int opt, const char *help, const char *name = nullptr,\n> +\tbool addOption(int opt, const char *help, const char *name = nullptr,\n> \t\t OptionArgument argument = ArgumentNone,\n> \t\t const char *argumentName = nullptr);\n> \n> -- \n> 2.20.1\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["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 248DC60B10\n\tfor ;\n\tThu, 31 Jan 2019 11:07:50 +0100 (CET)","from pendragon.ideasonboard.com (85-76-34-136-nat.elisa-mobile.fi\n\t[85.76.34.136])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EEDF341;\n\tThu, 31 Jan 2019 11:07:48 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1548929269;\n\tbh=bffthvaiVQdPR5envyOXy5U9d4BgLW5eswU/6pmBe6U=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=NCvVtdcHkfLmeJ+VpLz3kdwzG5S+SdKACIvc84vnKfa1/Htz+zOTJS1DWdGmAG5mU\n\t1KG3BIA2KXzkCJmZapD0OWCw6g/AUaHHBliiX/a/LoxoFcdqDMOOgqvxXbqd1ZzbPr\n\tBLJMMXCxTFDF3LMWedXWNgtG0BcgbtFe1pPTV+7w=","Date":"Thu, 31 Jan 2019 12:07:45 +0200","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190131100745.GG4197@pendragon.ideasonboard.com>","References":"<20190128004109.25860-1-niklas.soderlund@ragnatech.se>\n\t<20190128004109.25860-4-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190128004109.25860-4-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 3/6] cam: options: return if\n\taddOption() succeeds or not","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 31 Jan 2019 10:07:50 -0000"}}]