From 2fbe8d8b5fd58cdaaf1eab64cc65dbd667be532a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 11 Dec 2002 23:34:44 +0000 Subject: [PATCH] Fix off-by-one error. (#100853) 2002-12-11 Tor Lillqvist * glib/gtimer.c (g_timer_elapsed): Fix off-by-one error. (#100853) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ glib/gtimer.c | 4 ++-- 8 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b885a686..e43afcf71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-12-11 Tor Lillqvist + + * glib/gtimer.c (g_timer_elapsed): Fix off-by-one error. (#100853) + 2002-12-11 Pauli Virtanen * configure.in: Added "fi" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2b885a686..e43afcf71 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2002-12-11 Tor Lillqvist + + * glib/gtimer.c (g_timer_elapsed): Fix off-by-one error. (#100853) + 2002-12-11 Pauli Virtanen * configure.in: Added "fi" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2b885a686..e43afcf71 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2002-12-11 Tor Lillqvist + + * glib/gtimer.c (g_timer_elapsed): Fix off-by-one error. (#100853) + 2002-12-11 Pauli Virtanen * configure.in: Added "fi" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2b885a686..e43afcf71 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2002-12-11 Tor Lillqvist + + * glib/gtimer.c (g_timer_elapsed): Fix off-by-one error. (#100853) + 2002-12-11 Pauli Virtanen * configure.in: Added "fi" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2b885a686..e43afcf71 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2002-12-11 Tor Lillqvist + + * glib/gtimer.c (g_timer_elapsed): Fix off-by-one error. (#100853) + 2002-12-11 Pauli Virtanen * configure.in: Added "fi" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2b885a686..e43afcf71 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2002-12-11 Tor Lillqvist + + * glib/gtimer.c (g_timer_elapsed): Fix off-by-one error. (#100853) + 2002-12-11 Pauli Virtanen * configure.in: Added "fi" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2b885a686..e43afcf71 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2002-12-11 Tor Lillqvist + + * glib/gtimer.c (g_timer_elapsed): Fix off-by-one error. (#100853) + 2002-12-11 Pauli Virtanen * configure.in: Added "fi" to ALL_LINGUAS. diff --git a/glib/gtimer.c b/glib/gtimer.c index f06d5bb9e..f82cbfbd1 100644 --- a/glib/gtimer.c +++ b/glib/gtimer.c @@ -133,7 +133,7 @@ g_timer_elapsed (GTimer *timer, /* Check for wraparound, which happens every 49.7 days. */ if (timer->end < timer->start) - total = (UINT_MAX - (timer->start - timer->end)) / 1000.0; + total = (UINT_MAX - (timer->start - timer->end - 1)) / 1000.0; else total = (timer->end - timer->start) / 1000.0; @@ -141,7 +141,7 @@ g_timer_elapsed (GTimer *timer, { if (timer->end < timer->start) *microseconds = - ((UINT_MAX - (timer->start - timer->end)) % 1000) * 1000; + ((UINT_MAX - (timer->start - timer->end - 1)) % 1000) * 1000; else *microseconds = ((timer->end - timer->start) % 1000) * 1000;