{"id":598,"url":"https://patchwork.libcamera.org/api/patches/598/?format=json","web_url":"https://patchwork.libcamera.org/patch/598/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190220143736.529-5-niklas.soderlund@ragnatech.se>","date":"2019-02-20T14:37:36","name":"[libcamera-devel,4/4] cam: Improve when usage information is printed","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"54b3eff041d2e4fa1ba017c3cdd5c00f5a05b82f","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/598/mbox/","series":[{"id":187,"url":"https://patchwork.libcamera.org/api/series/187/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=187","date":"2019-02-20T14:37:32","name":"cam: improve error paths","version":1,"mbox":"https://patchwork.libcamera.org/series/187/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/598/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/598/checks/","tags":{},"headers":{"Return-Path":"","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 E0964601EE\n\tfor ;\n\tWed, 20 Feb 2019 15:38:50 +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 3af2e8a3-351d-11e9-b530-005056917a89;\n\tWed, 20 Feb 2019 15:38:47 +0100 (CET)"],"X-Halon-ID":"3af2e8a3-351d-11e9-b530-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 20 Feb 2019 15:37:36 +0100","Message-Id":"<20190220143736.529-5-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190220143736.529-1-niklas.soderlund@ragnatech.se>","References":"<20190220143736.529-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 4/4] cam: Improve when usage information\n\tis printed","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":"Wed, 20 Feb 2019 14:38:51 -0000"},"content":"Running the cam tool without any options results in the tool to exit\nwith EXIT_FAILURE but no usage being printed, this is confusing. Improve\nthis by also printing the usage text.\n\nSigned-off-by: Niklas Söderlund \n---\n src/cam/main.cpp | 11 ++++++-----\n 1 file changed, 6 insertions(+), 5 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 522d2f0d3373dc25..9f4c8e26751d982c 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -41,6 +41,8 @@ void signalHandler(int signal)\n \n static int parseOptions(int argc, char *argv[])\n {\n+\tint ret = 0;\n+\n \tKeyValueParser formatKeyValue;\n \tformatKeyValue.addOption(\"width\", OptionInteger, \"Width in pixels\",\n \t\t\t\t ArgumentRequired);\n@@ -67,15 +69,14 @@ static int parseOptions(int argc, char *argv[])\n \tparser.addOption(OptList, OptionNone, \"List all cameras\", \"list\");\n \n \toptions = parser.parse(argc, argv);\n+\n \tif (!options.valid())\n-\t\treturn -EINVAL;\n+\t\tret = -EINVAL;\n \n-\tif (argc == 1 || options.isSet(OptHelp)) {\n+\tif (ret || options.isSet(OptHelp))\n \t\tparser.usage();\n-\t\treturn 1;\n-\t}\n \n-\treturn 0;\n+\treturn ret;\n }\n \n static bool configureStreams(Camera *camera, std::vector &streams)\n","prefixes":["libcamera-devel","4/4"]}