[libcamera-devel,v3,05/11] libcamera: pipeline: Use existing variable definitions
diff mbox series

Message ID 20201016090014.64703-6-kieran.bingham@ideasonboard.com
State Accepted
Headers show
Series
  • Shadowed Variables
Related show

Commit Message

Kieran Bingham Oct. 16, 2020, 9 a.m. UTC 
Prevent variable shadowing by removing the redeclaration of variables
with the same name (and type) where the existing variable can be reused.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +-
 src/libcamera/pipeline/simple/simple.cpp           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch
diff mbox series 

diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 85e0a1f26ab6..2d70d984a276 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -1008,7 +1008,7 @@  int PipelineHandlerRPi::queueAllBuffers(Camera *camera)
 			 */
 			unsigned int i;
 			for (i = 0; i < data->dropFrameCount_; i++) {
-				int ret = stream->queueBuffer(nullptr);
+				ret = stream->queueBuffer(nullptr);
 				if (ret)
 					return ret;
 			}
diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
index 999c44515023..33daa2fb1b7b 100644
--- a/src/libcamera/pipeline/simple/simple.cpp
+++ b/src/libcamera/pipeline/simple/simple.cpp
@@ -612,8 +612,8 @@  int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)
 	useConverter_ = config->needConversion();
 
 	if (useConverter_) {
-		int ret = converter_->configure(pipeConfig.pixelFormat,
-						pipeConfig.captureSize, &cfg);
+		ret = converter_->configure(pipeConfig.pixelFormat,
+					    pipeConfig.captureSize, &cfg);
 		if (ret < 0) {
 			LOG(SimplePipeline, Error)
 				<< "Unable to configure converter";