2004-10-11 Paul Jakma <paul@dishone.st>

	* thread.c: (funcname_thread_add_timer)
	  (funcname_thread_add_timer_msec) Fix mistakes from last change.
	  Pointed out by Liu Xin in [quagga-dev 1609].

diff --git a/lib/ChangeLog b/lib/ChangeLog
index dc8fae8a9ae994415e116b4140506432249ce746..30eafa812db075ba65ecebb1a34d82de44df4287 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-11 Paul Jakma <paul@dishone.st>
+
+       * thread.c: (funcname_thread_add_timer) 
+         (funcname_thread_add_timer_msec) Fix mistakes from last change.
+         Pointed out by Liu Xin in [quagga-dev 1609].
+
 2004-10-10 Paul Jakma <paul@dishone.st>
 
        * version.h.in: (pid_output*) add const qualifier.

diff --git a/lib/thread.c b/lib/thread.c
index 2847b8bfde2a6a6cd699de3ca5432260f93d5604..e1625e395f5f53bd37740077bf10cc2020151879 100644 (file)
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -534,7 +534,7 @@ funcname_thread_add_timer (struct thread_master *m,
 
   assert (m != NULL);
 
-  trel.tv_sec += timer;
+  trel.tv_sec = timer;
   trel.tv_usec = 0;
 
   return funcname_thread_add_timer_timeval (m, func, arg, &trel, funcname);
@@ -552,8 +552,8 @@ funcname_thread_add_timer_msec (struct thread_master *m,
 
   timer = 1000*timer; /* milli -> micro */
 
-  trel.tv_sec += timer / TIMER_SECOND_MICRO;
-  trel.tv_usec += (timer % TIMER_SECOND_MICRO);
+  trel.tv_sec = timer / TIMER_SECOND_MICRO;
+  trel.tv_usec = (timer % TIMER_SECOND_MICRO);
 
   return funcname_thread_add_timer_timeval (m, func, arg, &trel, funcname);
 }