mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-07-24 05:02:10 +00:00
change switch_core_timer_next to return switch_status_t, update all users to new usage, add some error checking to mod_conference so that it bails out of the loops more gracefully on shutdown.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4454 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
+3
-3
@@ -1315,7 +1315,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_init(switch_timer_t *timer, ch
|
||||
|
||||
}
|
||||
|
||||
SWITCH_DECLARE(int) switch_core_timer_next(switch_timer_t *timer)
|
||||
SWITCH_DECLARE(switch_status_t) switch_core_timer_next(switch_timer_t *timer)
|
||||
{
|
||||
if (!timer->timer_interface) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initilized!\n");
|
||||
@@ -1323,9 +1323,9 @@ SWITCH_DECLARE(int) switch_core_timer_next(switch_timer_t *timer)
|
||||
}
|
||||
|
||||
if (timer->timer_interface->timer_next(timer) == SWITCH_STATUS_SUCCESS) {
|
||||
return timer->samplecount;
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
} else {
|
||||
return -1;
|
||||
return SWITCH_STATUS_GENERR;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user