[libcamera-devel,v4,01/15] libcamera: thread: Prevent shadowing of signal name
diff mbox series

Message ID 20201021154148.511505-2-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 
The Thread::wait() function creates a boolean flag 'finished' which
shadows the internal member signal of the same name.

Rename the boolean flag to prevent confusion and shadowing of the signal.

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

Patch
diff mbox series 

diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp
index 87006a9c4301..b5d7103ad341 100644
--- a/src/libcamera/thread.cpp
+++ b/src/libcamera/thread.cpp
@@ -374,7 +374,7 @@  void Thread::exit(int code)
  */
 bool Thread::wait(utils::duration duration)
 {
-	bool finished = true;
+	bool hasFinished = true;
 
 	{
 		MutexLocker locker(data_->mutex_);
@@ -382,14 +382,14 @@  bool Thread::wait(utils::duration duration)
 		if (duration == utils::duration::max())
 			data_->cv_.wait(locker, [&]() { return !data_->running_; });
 		else
-			finished = data_->cv_.wait_for(locker, duration,
-						       [&]() { return !data_->running_; });
+			hasFinished = data_->cv_.wait_for(locker, duration,
+							  [&]() { return !data_->running_; });
 	}
 
 	if (thread_.joinable())
 		thread_.join();
 
-	return finished;
+	return hasFinished;
 }
 
 /**