{"id":608,"url":"https://patchwork.libcamera.org/api/patches/608/?format=json","web_url":"https://patchwork.libcamera.org/patch/608/","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":"<20190224171407.7856-5-niklas.soderlund@ragnatech.se>","date":"2019-02-24T17:14:07","name":"[libcamera-devel,v2,4/4] cam: Improve when usage information is printed","commit_ref":"374c102073bf8712dc5433f778ca39f85bb97f9c","pull_url":null,"state":"accepted","archived":false,"hash":"833281ff697cf80fec51e87d2fec8caba2236b67","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/608/mbox/","series":[{"id":189,"url":"https://patchwork.libcamera.org/api/series/189/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=189","date":"2019-02-24T17:14:03","name":"cam: improve error paths","version":2,"mbox":"https://patchwork.libcamera.org/series/189/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/608/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/608/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 56A16601E2\n\tfor ;\n\tSun, 24 Feb 2019 18:14:28 +0100 (CET)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid a3a417a2-3857-11e9-a58a-005056917f90;\n\tSun, 24 Feb 2019 18:14:27 +0100 (CET)"],"X-Halon-ID":"a3a417a2-3857-11e9-a58a-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 24 Feb 2019 18:14:07 +0100","Message-Id":"<20190224171407.7856-5-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190224171407.7856-1-niklas.soderlund@ragnatech.se>","References":"<20190224171407.7856-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 4/4] cam: Improve when usage\n\tinformation is 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":"Sun, 24 Feb 2019 17:14:28 -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 | 9 +++------\n 1 file changed, 3 insertions(+), 6 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 522d2f0d3373dc25..90859fe04abfb944 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -67,12 +67,9 @@ static int parseOptions(int argc, char *argv[])\n \tparser.addOption(OptList, OptionNone, \"List all cameras\", \"list\");\n \n \toptions = parser.parse(argc, argv);\n-\tif (!options.valid())\n-\t\treturn -EINVAL;\n-\n-\tif (argc == 1 || options.isSet(OptHelp)) {\n+\tif (!options.valid() || options.isSet(OptHelp)) {\n \t\tparser.usage();\n-\t\treturn 1;\n+\t\treturn !options.valid() ? -EINVAL : -EINTR;\n \t}\n \n \treturn 0;\n@@ -207,7 +204,7 @@ int main(int argc, char **argv)\n \n \tret = parseOptions(argc, argv);\n \tif (ret < 0)\n-\t\treturn EXIT_FAILURE;\n+\t\treturn ret == -EINTR ? 0 : EXIT_FAILURE;\n \n \tCameraManager *cm = CameraManager::instance();\n \n","prefixes":["libcamera-devel","v2","4/4"]}