Commit 1ef10744 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-21534: Fix -Wmaybe-uninitialized

group_commit_lock::release(): Ensure that prev will be initialized,
simplify a comparison, and fix some white space.
parent a736a2cb
...@@ -261,14 +261,14 @@ void group_commit_lock::release(value_type num) ...@@ -261,14 +261,14 @@ void group_commit_lock::release(value_type num)
group_commit_waiter_t* wakeup_list = nullptr; group_commit_waiter_t* wakeup_list = nullptr;
int extra_wake = 0; int extra_wake = 0;
for (cur = m_waiters_list; cur; cur = next) for (prev= nullptr, cur= m_waiters_list; cur; cur= next)
{ {
next = cur->m_next; next= cur->m_next;
if (cur->m_value <= num || extra_wake++ == 0) if (cur->m_value <= num || extra_wake++ == 0)
{ {
/* Move current waiter to wakeup_list*/ /* Move current waiter to wakeup_list*/
if (cur == m_waiters_list) if (!prev)
{ {
/* Remove from the start of the list.*/ /* Remove from the start of the list.*/
m_waiters_list = next; m_waiters_list = next;
...@@ -276,7 +276,7 @@ void group_commit_lock::release(value_type num) ...@@ -276,7 +276,7 @@ void group_commit_lock::release(value_type num)
else else
{ {
/* Remove from the middle of the list.*/ /* Remove from the middle of the list.*/
prev->m_next = cur->m_next; prev->m_next= cur->m_next;
} }
/* Append entry to the wakeup list.*/ /* Append entry to the wakeup list.*/
...@@ -285,14 +285,14 @@ void group_commit_lock::release(value_type num) ...@@ -285,14 +285,14 @@ void group_commit_lock::release(value_type num)
} }
else else
{ {
prev = cur; prev= cur;
} }
} }
lk.unlock(); lk.unlock();
for (cur = wakeup_list; cur; cur = next) for (cur= wakeup_list; cur; cur= next)
{ {
next = cur->m_next; next= cur->m_next;
cur->m_sema.wake(); cur->m_sema.wake();
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment