{"id":9256,"url":"https://patchwork.libcamera.org/api/patches/9256/?format=json","web_url":"https://patchwork.libcamera.org/patch/9256/","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":"<20200806130937.2991606-6-niklas.soderlund@ragnatech.se>","date":"2020-08-06T13:09:35","name":"[libcamera-devel,5/7] cam: Rename cameraName variable","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7990aa72e1858d3eb3fa2e97bc82f88364bf4c77","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/9256/mbox/","series":[{"id":1205,"url":"https://patchwork.libcamera.org/api/series/1205/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1205","date":"2020-08-06T13:09:30","name":"libcamera: Allow for user-friendly names in applications","version":1,"mbox":"https://patchwork.libcamera.org/series/1205/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9256/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9256/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id F1416BD87A\n\tfor ;\n\tThu, 6 Aug 2020 13:09:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9A4C260CDA;\n\tThu, 6 Aug 2020 15:09:49 +0200 (CEST)","from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C99C06098D\n\tfor ;\n\tThu, 6 Aug 2020 15:09:47 +0200 (CEST)","from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 187896c0-d7e6-11ea-b48b-0050569116f7;\n\tThu, 06 Aug 2020 15:09:44 +0200 (CEST)"],"X-Halon-ID":"187896c0-d7e6-11ea-b48b-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 6 Aug 2020 15:09:35 +0200","Message-Id":"<20200806130937.2991606-6-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200806130937.2991606-1-niklas.soderlund@ragnatech.se>","References":"<20200806130937.2991606-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 5/7] cam: Rename cameraName variable","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"When converting Camera::name() to Camera::id() one variable in cam was\nleft unnoticed, rename it to cameraId.\n\nSigned-off-by: Niklas Söderlund \n---\n src/cam/main.cpp | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex fb7bcbd9c67ec672..cc3facd5a5b22092 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -95,13 +95,13 @@ int CamApp::init(int argc, char **argv)\n \t}\n \n \tif (options_.isSet(OptCamera)) {\n-\t\tconst std::string &cameraName = options_[OptCamera];\n+\t\tconst std::string &cameraId = options_[OptCamera];\n \t\tchar *endptr;\n-\t\tunsigned long index = strtoul(cameraName.c_str(), &endptr, 10);\n+\t\tunsigned long index = strtoul(cameraId.c_str(), &endptr, 10);\n \t\tif (*endptr == '\\0' && index > 0 && index <= cm_->cameras().size())\n \t\t\tcamera_ = cm_->cameras()[index - 1];\n \t\telse\n-\t\t\tcamera_ = cm_->get(cameraName);\n+\t\t\tcamera_ = cm_->get(cameraId);\n \n \t\tif (!camera_) {\n \t\t\tstd::cout << \"Camera \"\n","prefixes":["libcamera-devel","5/7"]}