{"id":10188,"url":"https://patchwork.libcamera.org/api/1.1/patches/10188/?format=json","web_url":"https://patchwork.libcamera.org/patch/10188/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20201021154148.511505-12-kieran.bingham@ideasonboard.com>","date":"2020-10-21T15:41:44","name":"[libcamera-devel,v4,11/15] v4l2: camera: Prevent shadowing within V4L2Camera::Buffer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3ad2e6ef35b0ca5764674f5c04197d7f992c65f6","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10188/mbox/","series":[{"id":1401,"url":"https://patchwork.libcamera.org/api/1.1/series/1401/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1401","date":"2020-10-21T15:41:33","name":"Shadowed Variables","version":4,"mbox":"https://patchwork.libcamera.org/series/1401/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10188/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10188/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 AE025BDB13\n\tfor ;\n\tWed, 21 Oct 2020 15:42:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7AF9760E12;\n\tWed, 21 Oct 2020 17:42:04 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 06E7060E81\n\tfor ;\n\tWed, 21 Oct 2020 17:41:57 +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 A5D0792;\n\tWed, 21 Oct 2020 17:41:56 +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=\"NvGLY0Mo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1603294916;\n\tbh=cjtTz+AHW3Sk5fLAVkX/mYl+cI/e1cATkJKNjY7Znxo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=NvGLY0MoSwncIbv4EwuU14TEpKB1ZxQ9W+uaY0XT/jXwG8pkLon0b7bZHYNET3OT9\n\toWXlKNPV7AgTxGYk56AejeTUCjuNOJ2/BgD8brO72P55QadwiIvJzmar+sJdVUHsw8\n\tTuUcBc8z6CMdcFlKyBpj4+E11yv/hBwsWa4ivhUc=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Wed, 21 Oct 2020 16:41:44 +0100","Message-Id":"<20201021154148.511505-12-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20201021154148.511505-1-kieran.bingham@ideasonboard.com>","References":"<20201021154148.511505-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 11/15] v4l2: camera: Prevent shadowing\n\twithin V4L2Camera::Buffer","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Rename the internal member variables to use the post-fixed '_' member\nvariable naming style. This in turn ensures variable shadowing does not\noccur on the constructor.\n\nSigned-off-by: Kieran Bingham \n---\n src/v4l2/v4l2_camera.h | 6 +++---\n src/v4l2/v4l2_camera_proxy.cpp | 4 ++--\n 2 files changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex a6c35a2eb578..d238046250e3 100644\n--- a/src/v4l2/v4l2_camera.h\n+++ b/src/v4l2/v4l2_camera.h\n@@ -26,12 +26,12 @@ class V4L2Camera\n public:\n \tstruct Buffer {\n \t\tBuffer(unsigned int index, const FrameMetadata &data)\n-\t\t\t: index(index), data(data)\n+\t\t\t: index_(index), data_(data)\n \t\t{\n \t\t}\n \n-\t\tunsigned int index;\n-\t\tFrameMetadata data;\n+\t\tunsigned int index_;\n+\t\tFrameMetadata data_;\n \t};\n \n \tV4L2Camera(std::shared_ptr camera);\ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 7803d37ecf4f..f8bfe595e90e 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -206,8 +206,8 @@ void V4L2CameraProxy::updateBuffers()\n {\n \tstd::vector completedBuffers = vcam_->completedBuffers();\n \tfor (const V4L2Camera::Buffer &buffer : completedBuffers) {\n-\t\tconst FrameMetadata &fmd = buffer.data;\n-\t\tstruct v4l2_buffer &buf = buffers_[buffer.index];\n+\t\tconst FrameMetadata &fmd = buffer.data_;\n+\t\tstruct v4l2_buffer &buf = buffers_[buffer.index_];\n \n \t\tswitch (fmd.status) {\n \t\tcase FrameMetadata::FrameSuccess:\n","prefixes":["libcamera-devel","v4","11/15"]}