Skip to content
Snippets Groups Projects
Commit 2b39b36d authored by Richard Mudgett's avatar Richard Mudgett
Browse files

ooh323c: Fix gcc 4.6.3 compiler warnings.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@404219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent d9b7ce05
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,6 @@ ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment