From a675c80e1a6ccc0b74ba9836b3f0914883df68c8 Mon Sep 17 00:00:00 2001 From: bala Date: Mon, 2 Sep 2002 15:01:15 +0000 Subject: ChangeLogTag: Mon Sep 2 10:00:40 2002 Balachandran Natarajan --- ChangeLog | 4 ++++ ChangeLogs/ChangeLog-03a | 4 ++++ ace/Timer_List_T.cpp | 10 +++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d60f342c157..51657685f0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Sep 2 10:00:40 2002 Balachandran Natarajan + + * ace/Timer_List_T.cpp (get_first_i): Fixes fuzz errors. + Sun Sep 01 08:18:37 UTC 2002 Johnny Willemsen * ace/Task.cpp (svc_run): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index d60f342c157..51657685f0d 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,7 @@ +Mon Sep 2 10:00:40 2002 Balachandran Natarajan + + * ace/Timer_List_T.cpp (get_first_i): Fixes fuzz errors. + Sun Sep 01 08:18:37 UTC 2002 Johnny Willemsen * ace/Task.cpp (svc_run): diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp index df9f31b42cb..821a87f40ff 100644 --- a/ace/Timer_List_T.cpp +++ b/ace/Timer_List_T.cpp @@ -202,7 +202,7 @@ ACE_Timer_List_T::schedule (const TYPE &type, /// The shared scheduling functionality between schedule() and reschedule() template void -ACE_Timer_List_T::schedule_i (ACE_Timer_Node_T* n, +ACE_Timer_List_T::schedule_i (ACE_Timer_Node_T* n, const ACE_Time_Value& expire) { if (this->is_empty()) { @@ -233,7 +233,7 @@ ACE_Timer_Node_T* ACE_Timer_List_T::find_node(long timer_id) const { ACE_Timer_Node_T* n = this->get_first_i(); - if (n == 0) + if (n == 0) return 0; for (; n != this->head_; n = n->get_next()) { @@ -245,8 +245,8 @@ ACE_Timer_List_T::find_node(long timer_id) const } // Locate and update the inteval on the timer_id -template int -ACE_Timer_List_T::reset_interval (long timer_id, +template int +ACE_Timer_List_T::reset_interval (long timer_id, const ACE_Time_Value &interval) { ACE_TRACE ("ACE_Timer_List_T::reset_interval"); @@ -294,7 +294,7 @@ ACE_Timer_List_T::cancel (const TYPE &type, int skip_cl if (n->get_type() == type) // Note: Typically Type is an ACE_Event_Handler* { ++num_canceled; - + ACE_Timer_Node_T* tmp = n; n = n->get_next(); int always_skip_close = 1; // todo : Is this correct? -- cgit v1.2.1