{"id":10066,"url":"https://patchwork.libcamera.org/api/1.1/patches/10066/?format=json","web_url":"https://patchwork.libcamera.org/patch/10066/","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":"<20201015223750.58563-6-kieran.bingham@ideasonboard.com>","date":"2020-10-15T22:37:44","name":"[libcamera-devel,v2,05/11] libcamera: pipeline: Use existing variable definitions","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7b2e9caf6c72e906053999097c3f9b148e08f267","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/10066/mbox/","series":[{"id":1376,"url":"https://patchwork.libcamera.org/api/1.1/series/1376/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1376","date":"2020-10-15T22:37:39","name":"Shadowed Variables","version":2,"mbox":"https://patchwork.libcamera.org/series/1376/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10066/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10066/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 51257BEEDF\n\tfor ;\n\tThu, 15 Oct 2020 22:38:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0525F610D0;\n\tFri, 16 Oct 2020 00:38:02 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5272261081\n\tfor ;\n\tFri, 16 Oct 2020 00:37: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 E359BA42;\n\tFri, 16 Oct 2020 00:37: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=\"fDuXAQiQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602801477;\n\tbh=9USVpiBJjyne4Vu1QMRis8SYEWbL+Hye0a0n2VW8kUI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=fDuXAQiQ1ZED8R0otvtVroi9oFwj5jgZyJzgkOvd0TfLacVUEIdVSlXz6ieF4T9Xq\n\tswDdboDQCPw4/pJx91Ndz/aHEAcJ4QK2cHCK5AiVwQzf9zYThjAYsigQgvxFXHebbn\n\t9PTrDHUG01DySJbo7fEVSpGOq3/PCOuCssB/a/Ic=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Thu, 15 Oct 2020 23:37:44 +0100","Message-Id":"<20201015223750.58563-6-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20201015223750.58563-1-kieran.bingham@ideasonboard.com>","References":"<20201015223750.58563-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 05/11] libcamera: pipeline: Use\n\texisting variable definitions","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":"Prevent variable aliasing by removing the redeclaration of variables\nwith the same name (and type) where the existing variable can be reused.\n\nSigned-off-by: Kieran Bingham \n---\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n src/libcamera/pipeline/simple/simple.cpp | 4 ++--\n 2 files changed, 3 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 85e0a1f26ab6..2d70d984a276 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1008,7 +1008,7 @@ int PipelineHandlerRPi::queueAllBuffers(Camera *camera)\n \t\t\t */\n \t\t\tunsigned int i;\n \t\t\tfor (i = 0; i < data->dropFrameCount_; i++) {\n-\t\t\t\tint ret = stream->queueBuffer(nullptr);\n+\t\t\t\tret = stream->queueBuffer(nullptr);\n \t\t\t\tif (ret)\n \t\t\t\t\treturn ret;\n \t\t\t}\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 999c44515023..33daa2fb1b7b 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -612,8 +612,8 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \tuseConverter_ = config->needConversion();\n \n \tif (useConverter_) {\n-\t\tint ret = converter_->configure(pipeConfig.pixelFormat,\n-\t\t\t\t\t\tpipeConfig.captureSize, &cfg);\n+\t\tret = converter_->configure(pipeConfig.pixelFormat,\n+\t\t\t\t\t pipeConfig.captureSize, &cfg);\n \t\tif (ret < 0) {\n \t\t\tLOG(SimplePipeline, Error)\n \t\t\t\t<< \"Unable to configure converter\";\n","prefixes":["libcamera-devel","v2","05/11"]}