Attachment 8699 Details for Bug 18099 – file.diff

[patch] file.diff

file.diff (text/plain), 1.62 KB, created by cejkar on 2000-04-19 18:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cejkar

Created: 2000-04-19 18:40:00 UTC

Size: 1.62 KB

patch

obsolete

>--- src/lib/libc_r/uthread/uthread_cond.c.orig	Wed Apr 19 18:52:04 2000
>+++ src/lib/libc_r/uthread/uthread_cond.c	Wed Apr 19 18:52:04 2000
>@@ -308,19 +308,14 @@
> 	
> 	if (cond == NULL || abstime == NULL)
> 		rval = EINVAL;
>-
>-	if (abstime->tv_sec < 0 || 
>-		abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) {
>-		errno = EINVAL;
>-		_thread_leave_cancellation_point();
>-		return (-1);
>-	}
>-
>+	else if (abstime->tv_sec < 0 || 
>+		abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
>+		rval = EINVAL;
> 	/*
> 	 * If the condition variable is statically initialized,
> 	 * perform the dynamic initialization:
> 	 */
>-	if (*cond != NULL ||
>+	else if (*cond != NULL ||
> 	    (rval = pthread_cond_init(cond,NULL)) == 0) {
> 
> 		_thread_enter_cancellation_point();
>@@ -473,9 +468,14 @@
> 	int             rval = 0;
> 	pthread_t       pthread;
> 
>-	if (cond == NULL || *cond == NULL)
>+	if (cond == NULL)
> 		rval = EINVAL;
>-	else {
>+	/*
>+	 * If the condition variable is statically initialized,
>+	 * perform the dynamic initialization:
>+	 */
>+	else if (*cond != NULL ||
>+	    (rval = pthread_cond_init(cond, NULL)) == 0) {
> 		/*
> 		 * Defer signals to protect the scheduling queues
> 		 * from access by the signal handler:
>@@ -525,9 +525,14 @@
> 	int             rval = 0;
> 	pthread_t       pthread;
> 
>-	if (cond == NULL || *cond == NULL)
>+	if (cond == NULL)
> 		rval = EINVAL;
>-	else {
>+	/*
>+	 * If the condition variable is statically initialized,
>+	 * perform the dynamic initialization:
>+	 */
>+	else if (*cond != NULL ||
>+	    (rval = pthread_cond_init(cond,NULL)) == 0) {
> 		/*
> 		 * Defer signals to protect the scheduling queues
> 		 * from access by the signal handler:

Actions: View | Diff

Attachments on bug 18099: 8699