Patch Detail
Show a patch.
GET /api/patches/395/?format=api
{ "id": 395, "url": "https://patchwork.libcamera.org/api/patches/395/?format=api", "web_url": "https://patchwork.libcamera.org/patch/395/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190125212154.26950-2-niklas.soderlund@ragnatech.se>", "date": "2019-01-25T21:21:53", "name": "[libcamera-devel,RFC,1/2] cam: options: add parser for suboptions", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "00bf18184b8ae4a9aff405ee1dad18d5d94d3d48", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": { "id": 16, "url": "https://patchwork.libcamera.org/api/users/16/?format=api", "username": "neg", "first_name": "Niklas", "last_name": "Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "mbox": "https://patchwork.libcamera.org/patch/395/mbox/", "series": [ { "id": 135, "url": "https://patchwork.libcamera.org/api/series/135/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=135", "date": "2019-01-25T21:21:52", "name": "cam: make the --format option take arguments", "version": 1, "mbox": "https://patchwork.libcamera.org/series/135/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/395/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/395/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6291A60C6A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Jan 2019 22:22:13 +0100 (CET)", "from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 4460ee51-20e7-11e9-9adf-005056917a89;\n\tFri, 25 Jan 2019 22:22:06 +0100 (CET)" ], "X-Halon-ID": "4460ee51-20e7-11e9-9adf-005056917a89", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 25 Jan 2019 22:21:53 +0100", "Message-Id": "<20190125212154.26950-2-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190125212154.26950-1-niklas.soderlund@ragnatech.se>", "References": "<20190125212154.26950-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC 1/2] cam: options: add parser for suboptions", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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>", "X-List-Received-Date": "Fri, 25 Jan 2019 21:22:13 -0000" }, "content": "The cam utility will make use of lists of key/value pairs from the\ncommand line arguments. This is needed so that a user can among other\nthings describe complex stream format descriptions, which consists of a\nset of parameters.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/cam/options.cpp | 68 +++++++++++++++++++++++++++++++++++++++++++++\n src/cam/options.h | 24 ++++++++++++++++\n 2 files changed, 92 insertions(+)", "diff": "diff --git a/src/cam/options.cpp b/src/cam/options.cpp\nindex 55c42540f92478e6..3299cdfed69703fa 100644\n--- a/src/cam/options.cpp\n+++ b/src/cam/options.cpp\n@@ -180,3 +180,71 @@ void OptionsParser::Options::clear()\n {\n \tvalues_.clear();\n }\n+\n+void SubOptionsParser::addToken(const char *name)\n+{\n+\tif (!name)\n+\t\treturn;\n+\n+\t/* Reject duplicate options. */\n+\tfor (const char *option : options_)\n+\t\tif (!strcmp(name, option))\n+\t\t\treturn;\n+\n+\toptions_.push_back(name);\n+}\n+\n+SubOptionsParser::Options SubOptionsParser::parse(const char *argc)\n+{\n+\tconst char **tokens;\n+\tchar *dupe, *subs, *value;\n+\tOptions options;\n+\n+\ttokens = new const char *[options_.size() + 1]();\n+\tfor (unsigned int i = 0; i < options_.size(); i++)\n+\t\ttokens[i] = options_.at(i);\n+\n+\tdupe = strdup(argc);\n+\tsubs = dupe;\n+\twhile (*subs != '\\0') {\n+\t\tint opt = getsubopt(&subs, (char *const *)tokens, &value);\n+\n+\t\tif (opt == -1 || !value || value[0] == '\\0') {\n+\t\t\tif (opt == -1)\n+\t\t\t\tstd::cerr << \"Invalid option \" << value << std::endl;\n+\t\t\telse\n+\t\t\t\tstd::cerr << \"Missing argument for option \"\n+\t\t\t\t\t << tokens[opt] << std::endl;\n+\n+\t\t\toptions.clear();\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\toptions.values_[tokens[opt]] = value;\n+\t}\n+\n+\tfree(dupe);\n+\tdelete[] tokens;\n+\n+\treturn options;\n+}\n+\n+bool SubOptionsParser::Options::valid() const\n+{\n+\treturn !values_.empty();\n+}\n+\n+bool SubOptionsParser::Options::isSet(std::string opt) const\n+{\n+\treturn values_.find(opt) != values_.end();\n+}\n+\n+const std::string &SubOptionsParser::Options::operator[](std::string opt) const\n+{\n+\treturn values_.find(opt)->second;\n+}\n+\n+void SubOptionsParser::Options::clear()\n+{\n+\tvalues_.clear();\n+}\ndiff --git a/src/cam/options.h b/src/cam/options.h\nindex f99ea7300a71c24f..653dda0c76e52251 100644\n--- a/src/cam/options.h\n+++ b/src/cam/options.h\n@@ -57,4 +57,28 @@ private:\n \tstd::map<unsigned int, Option *> optionsMap_;\n };\n \n+class SubOptionsParser\n+{\n+public:\n+\tclass Options\n+\t{\n+\tpublic:\n+\t\tbool valid() const;\n+\t\tbool isSet(std::string opt) const;\n+\t\tconst std::string &operator[](std::string opt) const;\n+\n+\tprivate:\n+\t\tfriend class SubOptionsParser;\n+\t\tstd::map<std::string, std::string> values_;\n+\t\tvoid clear();\n+\t};\n+\n+\tvoid addToken(const char *token);\n+\n+\tOptions parse(const char *argc);\n+\n+private:\n+\tstd::vector<const char *> options_;\n+};\n+\n #endif /* __CAM_OPTIONS_H__ */\n", "prefixes": [ "libcamera-devel", "RFC", "1/2" ] }