kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ooh323c: Fix gcc 4.6.3 compiler warnings.

Browse Source 
........

Merged revisions 404212 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 404219 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 404263 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404264 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-12-18 21:12:58 +00:00
parent ed0c493222
commit 47c0b78690
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
addons/ooh323c/src/ooTimer.c
View File

@@ -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)