提交 fff2dd5b authored 作者: Michael Jerris's avatar Michael Jerris

Wed Jan 28 12:02:55 CST 2009 Pekka Pessi <first.last@nokia.com>

  * su_timer.c: removed redundant checks
  


git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11851 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 8247926a
Wed Feb 11 11:15:31 CST 2009 Wed Feb 11 11:15:57 CST 2009
...@@ -156,7 +156,6 @@ typedef union { ...@@ -156,7 +156,6 @@ typedef union {
*/ */
struct su_timer_s { struct su_timer_s {
/** Pointers within red-black tree */
su_task_r sut_task; /**< Task reference */ su_task_r sut_task; /**< Task reference */
size_t sut_heap_index; /**< Timer is set (inserted in heap) */ size_t sut_heap_index; /**< Timer is set (inserted in heap) */
su_time_t sut_when; /**< When timer should be waken up next time */ su_time_t sut_when; /**< When timer should be waken up next time */
...@@ -219,8 +218,6 @@ su_timer_set0(su_timer_queue_t *timers, ...@@ -219,8 +218,6 @@ su_timer_set0(su_timer_queue_t *timers,
{ {
int retval; int retval;
assert(timers);
if (timers == NULL) if (timers == NULL)
return -1; return -1;
...@@ -343,9 +340,6 @@ int su_timer_set_interval(su_timer_t *t, ...@@ -343,9 +340,6 @@ int su_timer_set_interval(su_timer_t *t,
{ {
su_timer_queue_t *timers = su_timer_tree(t, 0, "su_timer_set_interval"); su_timer_queue_t *timers = su_timer_tree(t, 0, "su_timer_set_interval");
if (t == NULL)
return -1;
return su_timer_set0(timers, t, wakeup, arg, su_now(), interval); return su_timer_set0(timers, t, wakeup, arg, su_now(), interval);
} }
...@@ -367,9 +361,6 @@ int su_timer_set(su_timer_t *t, ...@@ -367,9 +361,6 @@ int su_timer_set(su_timer_t *t,
{ {
su_timer_queue_t *timers = su_timer_tree(t, 1, "su_timer_set"); su_timer_queue_t *timers = su_timer_tree(t, 1, "su_timer_set");
if (timers == NULL)
return -1;
return su_timer_set0(timers, t, wakeup, arg, su_now(), t->sut_duration); return su_timer_set0(timers, t, wakeup, arg, su_now(), t->sut_duration);
} }
...@@ -391,9 +382,6 @@ int su_timer_set_at(su_timer_t *t, ...@@ -391,9 +382,6 @@ int su_timer_set_at(su_timer_t *t,
{ {
su_timer_queue_t *timers = su_timer_tree(t, 0, "su_timer_set_at"); su_timer_queue_t *timers = su_timer_tree(t, 0, "su_timer_set_at");
if (timers == NULL)
return -1;
return su_timer_set0(timers, t, wakeup, arg, when, 0); return su_timer_set0(timers, t, wakeup, arg, when, 0);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论