[libcamera-devel,v4,07/15] android: camera_device: Use existing variable definitions
diff mbox series

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

Commit Message

Kieran Bingham Oct. 21, 2020, 3:41 p.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>
---
 src/android/camera_device.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Laurent Pinchart Oct. 21, 2020, 3:48 p.m. UTC | #1
Hi Kieran,

Thank you for the patch.

On Wed, Oct 21, 2020 at 04:41:40PM +0100, Kieran Bingham wrote:
> 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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  src/android/camera_device.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index e9404c2f3004..5272b9ecded7 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -1316,7 +1316,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
>  	 * the Android camera3_stream_t.
>  	 */
>  	for (CameraStream &cameraStream : streams_) {
> -		int ret = cameraStream.configure();
> +		ret = cameraStream.configure();
>  		if (ret) {
>  			LOG(HAL, Error) << "Failed to configure camera stream";
>  			return ret;

Patch
diff mbox series

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index e9404c2f3004..5272b9ecded7 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1316,7 +1316,7 @@  int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
 	 * the Android camera3_stream_t.
 	 */
 	for (CameraStream &cameraStream : streams_) {
-		int ret = cameraStream.configure();
+		ret = cameraStream.configure();
 		if (ret) {
 			LOG(HAL, Error) << "Failed to configure camera stream";
 			return ret;