diff options
| author | Tim Janik <timj@gtk.org> | 2001-05-08 05:25:35 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2001-05-08 05:25:35 +0000 |
| commit | 4d7747a58e5f5fa8f494b2b78d6f2047022375f1 (patch) | |
| tree | 6f3b40c2836aeae7d4993d967ca59c05fc5422ff /gthread | |
| parent | 6cc6a59d38d48f6ea7b3367f362f2c4531eeaf92 (diff) | |
| download | glib-4d7747a58e5f5fa8f494b2b78d6f2047022375f1.tar.gz glib-4d7747a58e5f5fa8f494b2b78d6f2047022375f1.tar.bz2 glib-4d7747a58e5f5fa8f494b2b78d6f2047022375f1.zip | |
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.
Diffstat (limited to 'gthread')
| -rw-r--r-- | gthread/ChangeLog | 5 | ||||
| -rw-r--r-- | gthread/gthread-posix.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gthread/ChangeLog b/gthread/ChangeLog index f28365c92..adfc286b9 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 74d563f4b..faeafbc8c 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); |