From: Michael Jerris Date: Wed, 11 Feb 2009 17:15:37 +0000 (+0000) Subject: Wed Jan 28 12:01:13 CST 2009 Pekka Pessi X-Git-Tag: v1.0.3~281 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8247926a88232449e1af287c7a3e79274330fb2e;p=thirdparty%2Ffreeswitch.git Wed Jan 28 12:01:13 CST 2009 Pekka Pessi * su_timer.c: timers_remove() now set sut_heap_index to 0 git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11850 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 54b25b1b7c..086cdea6dd 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Wed Feb 11 11:14:50 CST 2009 +Wed Feb 11 11:15:31 CST 2009 diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c b/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c index 7accc788d9..63f720c354 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c @@ -225,7 +225,7 @@ su_timer_set0(su_timer_queue_t *timers, return -1; if (SU_TIMER_IS_SET(t)) - timers_remove(timers[0], t->sut_heap_index)->sut_heap_index = 0; + timers_remove(timers[0], t->sut_heap_index); t->sut_wakeup = wakeup; t->sut_arg = arg; @@ -481,7 +481,7 @@ int su_timer_reset(su_timer_t *t) return -1; if (SU_TIMER_IS_SET(t)) - timers_remove(timers[0], t->sut_heap_index)->sut_heap_index = 0; + timers_remove(timers[0], t->sut_heap_index); t->sut_wakeup = NULL; t->sut_arg = NULL; @@ -526,7 +526,7 @@ int su_timer_expire(su_timer_queue_t * const timers, break; } - timers_remove(timers[0], 1)->sut_heap_index = 0; + timers_remove(timers[0], 1); f = t->sut_wakeup; t->sut_wakeup = NULL; assert(f); @@ -609,7 +609,7 @@ int su_timer_reset_all(su_timer_queue_t *timers, su_task_r task) if (su_task_cmp(task, t->sut_task)) continue; - timers_remove(timers[0], i)->sut_heap_index = 0; + timers_remove(timers[0], i); su_free(NULL, t); n++;