Merge tag 'upstream/0.7.6'

Upstream version 0.7.6

1 files changed, 9 insertions, 9 deletions

diff --git a/timer.c b/timer.c
index 5afcab4..cb6500c 100644
--- a/timer.c
+++ b/timer.c
@@ -19,23 +19,23 @@
  */
 #include "wavemon.h"
 
-void start_timer(struct timer *t, unsigned long duration)
+static unsigned long get_usecs(void)
 {
 	struct timeval tv;
 	struct timezone tz;
 
 	gettimeofday(&tv, &tz);
 
-	t->stime = tv.tv_sec * 1000000 + tv.tv_usec;
-	t->duration = duration;
+	return tv.tv_sec * 1000000 + tv.tv_usec;
 }
 
-int end_timer(struct timer *t)
+void start_timer(struct timer *t, unsigned long duration)
 {
-	struct timeval tv;
-	struct timezone tz;
-
-	gettimeofday(&tv, &tz);
+	t->stime    = get_usecs();
+	t->duration = duration;
+}
 
-	return (tv.tv_sec * 1000000 + tv.tv_usec >= t->stime + t->duration);
+bool end_timer(struct timer *t)
+{
+	return get_usecs() >= t->stime + t->duration;
 }