[libcamera-devel] [PATCH v4 02/15] libcamera: pipeline: Prevent variable shadowing

[Kieran Bingham]

Remove variable shadowing within the pipeline handler implementations.

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

diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 331ada7a0f6c..7f8deb38bd22 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -512,9 +512,9 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,
 		/* Translate the V4L2PixelFormat to PixelFormat. */
 		std::map<PixelFormat, std::vector<SizeRange>> deviceFormats;
 		for (const auto &format : fmts) {
-			PixelFormat pixelFormat = format.first.toPixelFormat();
-			if (pixelFormat.isValid())
-				deviceFormats[pixelFormat] = format.second;
+			PixelFormat pf = format.first.toPixelFormat();
+			if (pf.isValid())
+				deviceFormats[pf] = format.second;
 		}
 
 		/* Add the stream format based on the device node used for the use case. */
diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp
index b4ee021f6210..c21479a191fe 100644
--- a/src/libcamera/pipeline/simple/converter.cpp
+++ b/src/libcamera/pipeline/simple/converter.cpp
@@ -72,11 +72,11 @@ std::vector<PixelFormat> SimpleConverter::formats(PixelFormat input)
 	 * Set the format on the input side (V4L2 output) of the converter to
 	 * enumerate the conversion capabilities on its output (V4L2 capture).
 	 */
-	V4L2DeviceFormat format;
-	format.fourcc = m2m_->output()->toV4L2PixelFormat(input);
-	format.size = { 1, 1 };
+	V4L2DeviceFormat v4l2Format;
+	v4l2Format.fourcc = m2m_->output()->toV4L2PixelFormat(input);
+	v4l2Format.size = { 1, 1 };
 
-	int ret = m2m_->output()->setFormat(&format);
+	int ret = m2m_->output()->setFormat(&v4l2Format);
 	if (ret < 0) {
 		LOG(SimplePipeline, Error)
 			<< "Failed to set format: " << strerror(-ret);
diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
index 8c00c0ffc121..477377301ee9 100644
--- a/src/libcamera/pipeline/simple/simple.cpp
+++ b/src/libcamera/pipeline/simple/simple.cpp
@@ -314,8 +314,8 @@ int SimpleCameraData::init()
 
 			config.outputSizes = converter->sizes(format.size);
 
-			for (PixelFormat format : converter->formats(pixelFormat))
-				formats_[format] = config;
+			for (PixelFormat fmt : converter->formats(pixelFormat))
+				formats_[fmt] = config;
 		}
 	}
 
diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
index a903a823f652..3862631b7bed 100644
--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
@@ -490,8 +490,8 @@ int UVCCameraData::init(MediaDevice *media)
 	/* Locate and initialise the camera data with the default video node. */
 	const std::vector<MediaEntity *> &entities = media->entities();
 	auto entity = std::find_if(entities.begin(), entities.end(),
-				   [](MediaEntity *entity) {
-					   return entity->flags() & MEDIA_ENT_FL_DEFAULT;
+				   [](MediaEntity *e) {
+					   return e->flags() & MEDIA_ENT_FL_DEFAULT;
 				   });
 	if (entity == entities.end()) {
 		LOG(UVC, Error) << "Could not find a default video device";
-- 
2.25.1