From 47c0b78690c13ebcc9311bbcc7201ef1f4864dcd Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 18 Dec 2013 21:12:58 +0000
Subject: [PATCH] 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
---
addons/ooh323c/src/ooTimer.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/addons/ooh323c/src/ooTimer.c b/addons/ooh323c/src/ooTimer.c
index a15421ad2d..efb863ef47 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)
--
GitLab