Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Empty out queue and use existing code to re-add elems we want to keep.

Browse source 
Candidate for 4.2.
This commit is contained in:
ehouse 2009-02-28 16:11:09 +00:00
parent 9abb637330
commit 21d4203fe2
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
xwords4/common/comms.c
View file

@ -861,12 +861,14 @@ removeFromQueue( CommsCtxt* comms, XP_PlayerAddr channelNo, MsgID msgID )
if ( (channelNo == 0) || !!getRecordFor(comms, NULL, channelNo) ) {
MsgQueueElem* newHead = NULL;
MsgQueueElem* newTail = NULL;
MsgQueueElem* elem;
MsgQueueElem* elem = comms->msgQueueHead;
MsgQueueElem* next;
for ( elem = comms->msgQueueHead; !!elem; elem = next ) {
/* empty the queue so we can add all back again */
comms->msgQueueHead = comms->msgQueueTail = NULL;
comms->queueLen = 0;
for ( ; !!elem; elem = next ) {
XP_Bool knownGood = XP_FALSE;
next = elem->next;
@ -884,17 +886,10 @@ removeFromQueue( CommsCtxt* comms, XP_PlayerAddr channelNo, MsgID msgID )
if ( !knownGood && (elem->msgID <= msgID) ) {
freeElem( comms, elem );
--comms->queueLen;
} else if ( NULL == newHead ) {
newHead = newTail = elem;
} else {
newTail->next = elem;
newTail = elem;
addToQueue( comms, elem );
}
}
comms->msgQueueHead = newHead;
comms->msgQueueTail = newTail;
}
XP_STATUSF( "%s: queueLen now %d", __func__, comms->queueLen );