From patchwork Wed Feb 20 14:37:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 598 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E0964601EE for ; Wed, 20 Feb 2019 15:38:50 +0100 (CET) X-Halon-ID: 3af2e8a3-351d-11e9-b530-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 3af2e8a3-351d-11e9-b530-005056917a89; Wed, 20 Feb 2019 15:38:47 +0100 (CET) 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 Subject: [libcamera-devel] [PATCH 4/4] cam: Improve when usage information is printed X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 14:38:51 -0000 Running the cam tool without any options results in the tool to exit with EXIT_FAILURE but no usage being printed, this is confusing. Improve this by also printing the usage text. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/cam/main.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cam/main.cpp b/src/cam/main.cpp index 522d2f0d3373dc25..9f4c8e26751d982c 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -41,6 +41,8 @@ void signalHandler(int signal) static int parseOptions(int argc, char *argv[]) { + int ret = 0; + KeyValueParser formatKeyValue; formatKeyValue.addOption("width", OptionInteger, "Width in pixels", ArgumentRequired); @@ -67,15 +69,14 @@ static int parseOptions(int argc, char *argv[]) parser.addOption(OptList, OptionNone, "List all cameras", "list"); options = parser.parse(argc, argv); + if (!options.valid()) - return -EINVAL; + ret = -EINVAL; - if (argc == 1 || options.isSet(OptHelp)) { + if (ret || options.isSet(OptHelp)) parser.usage(); - return 1; - } - return 0; + return ret; } static bool configureStreams(Camera *camera, std::vector &streams)