{"id":10081,"url":"https://patchwork.libcamera.org/api/patches/10081/?format=json","web_url":"https://patchwork.libcamera.org/patch/10081/","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":"<20201016090014.64703-5-kieran.bingham@ideasonboard.com>","date":"2020-10-16T09:00:07","name":"[libcamera-devel,v3,04/11] libcamera: pipeline: Prevent variable shadowing","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"fad5952eaabcde1c00d349a7ae6a8a4d9ed881d1","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10081/mbox/","series":[{"id":1379,"url":"https://patchwork.libcamera.org/api/series/1379/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1379","date":"2020-10-16T09:00:03","name":"Shadowed Variables","version":3,"mbox":"https://patchwork.libcamera.org/series/1379/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10081/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10081/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 13751BDB1F\n\tfor ;\n\tFri, 16 Oct 2020 09:00:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C825F610E5;\n\tFri, 16 Oct 2020 11:00:24 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 37654610F4\n\tfor ;\n\tFri, 16 Oct 2020 11:00:20 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B8231A43;\n\tFri, 16 Oct 2020 11:00:19 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"CMA8KBkM\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602838820;\n\tbh=6MMxyfhQbPeU9km43+a8Fd7YM//JS6mJ7t/Zc23+qLs=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=CMA8KBkMtLpvzO8iX1Rs+8M3ofgUynVRzz1cmCoshey6FNAzEg3AveXgnCBiNigbW\n\tOf3Aq8lD/7/hpHMrv4NaFNoGo2DmHkQUO8rMVPUjpX0IgUBY8tFXdHw7lVe3t9F0Y+\n\thihx7kdmczIj1NM1zxP98zOJFOH4o//f3zyD0v0E=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Fri, 16 Oct 2020 10:00:07 +0100","Message-Id":"<20201016090014.64703-5-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20201016090014.64703-1-kieran.bingham@ideasonboard.com>","References":"<20201016090014.64703-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 04/11] libcamera: pipeline: Prevent\n\tvariable shadowing","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":"Remove variable shadowing within the pipeline handler implementations.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \n---\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 6 +++---\n src/libcamera/pipeline/simple/converter.cpp | 8 ++++----\n src/libcamera/pipeline/simple/simple.cpp | 4 ++--\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 4 ++--\n 4 files changed, 11 insertions(+), 11 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 26dbd2573e04..85e0a1f26ab6 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -512,9 +512,9 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n \t\t/* Translate the V4L2PixelFormat to PixelFormat. */\n \t\tstd::map> deviceFormats;\n \t\tfor (const auto &format : fmts) {\n-\t\t\tPixelFormat pixelFormat = format.first.toPixelFormat();\n-\t\t\tif (pixelFormat.isValid())\n-\t\t\t\tdeviceFormats[pixelFormat] = format.second;\n+\t\t\tPixelFormat pf = format.first.toPixelFormat();\n+\t\t\tif (pf.isValid())\n+\t\t\t\tdeviceFormats[pf] = format.second;\n \t\t}\n \n \t\t/* Add the stream format based on the device node used for the use case. */\ndiff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\nindex 75fb297ebd58..2b541cd2bb3f 100644\n--- a/src/libcamera/pipeline/simple/converter.cpp\n+++ b/src/libcamera/pipeline/simple/converter.cpp\n@@ -72,11 +72,11 @@ std::vector SimpleConverter::formats(PixelFormat input)\n \t * Set the format on the input side (V4L2 output) of the converter to\n \t * enumerate the conversion capabilities on its output (V4L2 capture).\n \t */\n-\tV4L2DeviceFormat format;\n-\tformat.fourcc = m2m_->output()->toV4L2PixelFormat(input);\n-\tformat.size = { 1, 1 };\n+\tV4L2DeviceFormat v4l2Format;\n+\tv4l2Format.fourcc = m2m_->output()->toV4L2PixelFormat(input);\n+\tv4l2Format.size = { 1, 1 };\n \n-\tint ret = m2m_->output()->setFormat(&format);\n+\tint ret = m2m_->output()->setFormat(&v4l2Format);\n \tif (ret < 0) {\n \t\tLOG(SimplePipeline, Error)\n \t\t\t<< \"Failed to set format: \" << strerror(-ret);\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 7adb17e2d1db..999c44515023 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -314,8 +314,8 @@ int SimpleCameraData::init()\n \n \t\t\tconfig.outputSizes = converter->sizes(format.size);\n \n-\t\t\tfor (PixelFormat format : converter->formats(pixelFormat))\n-\t\t\t\tformats_[format] = config;\n+\t\t\tfor (PixelFormat fmt : converter->formats(pixelFormat))\n+\t\t\t\tformats_[fmt] = config;\n \t\t}\n \t}\n \ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 8ec0dac1e689..54ba1b87bb3e 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -490,8 +490,8 @@ int UVCCameraData::init(MediaDevice *media)\n \t/* Locate and initialise the camera data with the default video node. */\n \tconst std::vector &entities = media->entities();\n \tauto entity = std::find_if(entities.begin(), entities.end(),\n-\t\t\t\t [](MediaEntity *entity) {\n-\t\t\t\t\t return entity->flags() & MEDIA_ENT_FL_DEFAULT;\n+\t\t\t\t [](MediaEntity *e) {\n+\t\t\t\t\t return e->flags() & MEDIA_ENT_FL_DEFAULT;\n \t\t\t\t });\n \tif (entity == entities.end()) {\n \t\tLOG(UVC, Error) << \"Could not find a default video device\";\n","prefixes":["libcamera-devel","v3","04/11"]}