|
|
@ -17,7 +17,6 @@
|
|
|
|
#include "asterisk.h"
|
|
|
|
#include "asterisk.h"
|
|
|
|
#include "asterisk/lock.h"
|
|
|
|
#include "asterisk/lock.h"
|
|
|
|
|
|
|
|
|
|
|
|
#include "ootypes.h"
|
|
|
|
|
|
|
|
#include "ooDateTime.h"
|
|
|
|
#include "ooDateTime.h"
|
|
|
|
#include "ooTimer.h"
|
|
|
|
#include "ooTimer.h"
|
|
|
|
#include "ootrace.h"
|
|
|
|
#include "ootrace.h"
|
|
|
@ -102,7 +101,6 @@ OOBOOL ooTimerExpired (OOTimer* pTimer)
|
|
|
|
void ooTimerFireExpired (OOCTXT* pctxt, DList *pList)
|
|
|
|
void ooTimerFireExpired (OOCTXT* pctxt, DList *pList)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
OOTimer* pTimer;
|
|
|
|
OOTimer* pTimer;
|
|
|
|
int ret = OO_OK;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while (pList->count > 0) {
|
|
|
|
while (pList->count > 0) {
|
|
|
|
pTimer = (OOTimer*) pList->head->data;
|
|
|
|
pTimer = (OOTimer*) pList->head->data;
|
|
|
@ -114,7 +112,7 @@ void ooTimerFireExpired (OOCTXT* pctxt, DList *pList)
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
if (pTimer->reRegister) ooTimerReset (pctxt, pList, pTimer);
|
|
|
|
if (pTimer->reRegister) ooTimerReset (pctxt, pList, pTimer);
|
|
|
|
|
|
|
|
|
|
|
|
ret = (*pTimer->timeoutCB)(pTimer->cbData);
|
|
|
|
(*pTimer->timeoutCB)(pTimer->cbData);
|
|
|
|
|
|
|
|
|
|
|
|
if (!pTimer->reRegister) {
|
|
|
|
if (!pTimer->reRegister) {
|
|
|
|
ooTimerDelete (pctxt, pList, pTimer);
|
|
|
|
ooTimerDelete (pctxt, pList, pTimer);
|
|
|
@ -122,8 +120,6 @@ void ooTimerFireExpired (OOCTXT* pctxt, DList *pList)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else break;
|
|
|
|
else break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return (void)ret;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int ooTimerInsertEntry (OOCTXT* pctxt, DList *pList, OOTimer* pTimer)
|
|
|
|
int ooTimerInsertEntry (OOCTXT* pctxt, DList *pList, OOTimer* pTimer)
|
|
|
|