From: Tim Janik <timj@gtk.org>
Date: Tue, 8 May 2001 05:25:35 +0000 (+0000)
Subject: don't g_assert() the user specified time, but g_return_val_if_fail() here.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=4d7747a58e5f5fa8f494b2b78d6f2047022375f1;p=dana%2Fcg-glib.git

don't g_assert() the user specified time, but g_return_val_if_fail() here.

Fri May  4 04:14:45 2001  Tim Janik  <timj@gtk.org>

        * gthread-posix.c (g_cond_timed_wait_posix_impl): don't g_assert()
        the user specified time, but g_return_val_if_fail() here.
---

diff --git a/gthread/ChangeLog b/gthread/ChangeLog
index f28365c9..adfc286b 100644
--- a/gthread/ChangeLog
+++ b/gthread/ChangeLog
@@ -1,3 +1,8 @@
+Fri May  4 04:14:45 2001  Tim Janik  <timj@gtk.org>
+
+	* gthread-posix.c (g_cond_timed_wait_posix_impl): don't g_assert()
+	the user specified time, but g_return_val_if_fail() here.
+
 2001-04-03  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gthread-posix.c: Added special case for priorities on
diff --git a/gthread/gthread-posix.c b/gthread/gthread-posix.c
index 74d563f4..faeafbc8 100644
--- a/gthread/gthread-posix.c
+++ b/gthread/gthread-posix.c
@@ -202,7 +202,9 @@ g_cond_timed_wait_posix_impl (GCond * cond,
 
   end_time.tv_sec = abs_time->tv_sec;
   end_time.tv_nsec = abs_time->tv_usec * (G_NSEC_PER_SEC / G_USEC_PER_SEC);
-  g_assert (end_time.tv_nsec < G_NSEC_PER_SEC);
+
+  g_return_val_if_fail (end_time.tv_nsec < G_NSEC_PER_SEC, TRUE);
+
   result = pthread_cond_timedwait ((pthread_cond_t *) cond,
 				   (pthread_mutex_t *) entered_mutex,
 				   &end_time);