summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2013-12-18 21:12:58 +0000
committerRichard Mudgett <rmudgett@digium.com>2013-12-18 21:12:58 +0000
commit47c0b78690c13ebcc9311bbcc7201ef1f4864dcd (patch)
tree37b86d1400814fcd6b18a7fd0f322aab91c822df /addons
parented0c493222359dff36edba021877dee3c6c962bf (diff)
ooh323c: Fix gcc 4.6.3 compiler warnings.
........ 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
Diffstat (limited to 'addons')
-rw-r--r--addons/ooh323c/src/ooTimer.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/addons/ooh323c/src/ooTimer.c b/addons/ooh323c/src/ooTimer.c
index a15421ad2..efb863ef4 100644
--- a/addons/ooh323c/src/ooTimer.c
+++ b/addons/ooh323c/src/ooTimer.c
@@ -17,7 +17,6 @@
#include "asterisk.h"
#include "asterisk/lock.h"
-#include "ootypes.h"
#include "ooDateTime.h"
#include "ooTimer.h"
#include "ootrace.h"
@@ -102,7 +101,6 @@ OOBOOL ooTimerExpired (OOTimer* pTimer)
void ooTimerFireExpired (OOCTXT* pctxt, DList *pList)
{
OOTimer* pTimer;
- int ret = OO_OK;
while (pList->count > 0) {
pTimer = (OOTimer*) pList->head->data;
@@ -114,7 +112,7 @@ void ooTimerFireExpired (OOCTXT* pctxt, DList *pList)
*/
if (pTimer->reRegister) ooTimerReset (pctxt, pList, pTimer);
- ret = (*pTimer->timeoutCB)(pTimer->cbData);
+ (*pTimer->timeoutCB)(pTimer->cbData);
if (!pTimer->reRegister) {
ooTimerDelete (pctxt, pList, pTimer);
@@ -122,8 +120,6 @@ void ooTimerFireExpired (OOCTXT* pctxt, DList *pList)
}
else break;
}
-
- return (void)ret;
}
int ooTimerInsertEntry (OOCTXT* pctxt, DList *pList, OOTimer* pTimer)