diff options
| author | Alexandr Anikin <may@telecom-service.ru> | 2011-11-04 19:50:10 +0000 |
|---|---|---|
| committer | Alexandr Anikin <may@telecom-service.ru> | 2011-11-04 19:50:10 +0000 |
| commit | c580b163b540ac9bdf07704adf30fa11cb037b6b (patch) | |
| tree | 8dcfb376ea25d26ea16a0b44dd3082f5b3aca223 /addons/ooh323c/src/ooTimer.c | |
| parent | 969f4aa3d63585f8eabe6894b8676a684ceef56e (diff) | |
Final fix memleaks in GkClient codes, same for Timer codes.
(these memleaks stop development of gk codes, now i can continue)
Fix printHandler 'Unbalanced Structure' issues with locking printHandler
data for single thread.
........
Merged revisions 343281 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 343445 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@343448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'addons/ooh323c/src/ooTimer.c')
| -rw-r--r-- | addons/ooh323c/src/ooTimer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/ooh323c/src/ooTimer.c b/addons/ooh323c/src/ooTimer.c index 9e7f7227a..ad5f37f0a 100644 --- a/addons/ooh323c/src/ooTimer.c +++ b/addons/ooh323c/src/ooTimer.c @@ -79,7 +79,7 @@ void ooTimerComputeExpireTime (OOTimer* pTimer) void ooTimerDelete (OOCTXT* pctxt, DList *pList, OOTimer* pTimer) { - dListFindAndRemove (pList, pTimer); + dListFindAndRemove (pctxt, pList, pTimer); memFreePtr (pctxt, pTimer); } @@ -115,7 +115,7 @@ void ooTimerFireExpired (OOCTXT* pctxt, DList *pList) stat = (*pTimer->timeoutCB)(pTimer->cbData); - if (0 != stat || !pTimer->reRegister) { + if (!pTimer->reRegister) { ooTimerDelete (pctxt, pList, pTimer); } } @@ -175,7 +175,7 @@ struct timeval* ooTimerNextTimeout (DList *pList, struct timeval* ptimeout) void ooTimerReset (OOCTXT* pctxt, DList *pList, OOTimer* pTimer) { if (pTimer->reRegister) { - dListFindAndRemove (pList, pTimer); + dListFindAndRemove (pctxt, pList, pTimer); ooTimerComputeExpireTime (pTimer); ooTimerInsertEntry (pctxt, pList, pTimer); } |