[libcamera-devel,07/10] libcamera: pipeline_handler: Do not use argument as local variable

Message ID 20191028022224.795355-8-niklas.soderlund@ragnatech.se
State Accepted
Headers show
Series
  • libcamera: Fixes found while working on new buffer API
Related show

Commit Message

Niklas Söderlund Oct. 28, 2019, 2:22 a.m. UTC
In completeRequest() the request argument is used as a local variable,
this is confusing. Add a separate local variable instead of reusing the
argument.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 src/libcamera/pipeline_handler.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Laurent Pinchart Nov. 18, 2019, 11:29 a.m. UTC | #1
Hi Niklas,

Thank you for the patch.

On Mon, Oct 28, 2019 at 03:22:21AM +0100, Niklas Söderlund wrote:
> In completeRequest() the request argument is used as a local variable,
> this is confusing. Add a separate local variable instead of reusing the
> argument.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  src/libcamera/pipeline_handler.cpp | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
> index bf8c86d35c4fb6f4..f9ae767d529d44d9 100644
> --- a/src/libcamera/pipeline_handler.cpp
> +++ b/src/libcamera/pipeline_handler.cpp
> @@ -409,13 +409,13 @@ void PipelineHandler::completeRequest(Camera *camera, Request *request)
>  	CameraData *data = cameraData(camera);
>  
>  	while (!data->queuedRequests_.empty()) {
> -		request = data->queuedRequests_.front();
> -		if (request->status() == Request::RequestPending)
> +		Request *req = data->queuedRequests_.front();
> +		if (req->status() == Request::RequestPending)
>  			break;
>  
> -		ASSERT(!request->hasPendingBuffers());
> +		ASSERT(!req->hasPendingBuffers());
>  		data->queuedRequests_.pop_front();
> -		camera->requestComplete(request);
> +		camera->requestComplete(req);
>  	}
>  }
>

Patch

diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
index bf8c86d35c4fb6f4..f9ae767d529d44d9 100644
--- a/src/libcamera/pipeline_handler.cpp
+++ b/src/libcamera/pipeline_handler.cpp
@@ -409,13 +409,13 @@  void PipelineHandler::completeRequest(Camera *camera, Request *request)
 	CameraData *data = cameraData(camera);
 
 	while (!data->queuedRequests_.empty()) {
-		request = data->queuedRequests_.front();
-		if (request->status() == Request::RequestPending)
+		Request *req = data->queuedRequests_.front();
+		if (req->status() == Request::RequestPending)
 			break;
 
-		ASSERT(!request->hasPendingBuffers());
+		ASSERT(!req->hasPendingBuffers());
 		data->queuedRequests_.pop_front();
-		camera->requestComplete(request);
+		camera->requestComplete(req);
 	}
 }