PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: thread: Prevent shadowing of signal name

Browse Source 
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>
This commit is contained in:
Kieran Bingham
2020-07-28 13:23:08 +01:00
parent bb27fbf253
commit f4c234579b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcamera/thread.cpp
View File

@@ -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;
}
/**