[asterisk-commits] rmudgett: trunk r404264 - in /trunk: ./ addons/ooh323c/src/ooTimer.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Dec 18 15:12:58 2013
New Revision: 404264

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=404264
Log:
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

Modified:
    trunk/   (props changed)
    trunk/addons/ooh323c/src/ooTimer.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Wed Dec 18 15:12:58 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404006,404027,404029,404042,404046,404048,404050,404099,404137,404184,404204,404237,404261
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404006,404027,404029,404042,404046,404048,404050,404099,404137,404184,404204,404237,404261,404263

Modified: trunk/addons/ooh323c/src/ooTimer.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooTimer.c?view=diff&rev=404264&r1=404263&r2=404264
==============================================================================
--- trunk/addons/ooh323c/src/ooTimer.c (original)
+++ trunk/addons/ooh323c/src/ooTimer.c Wed Dec 18 15:12:58 2013
@@ -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 @@
 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 @@
           */
          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 @@
       }
       else break;
    }
-
-   return (void)ret;
 }
 
 int ooTimerInsertEntry (OOCTXT* pctxt, DList *pList, OOTimer* pTimer)