From owner-p4-projects@FreeBSD.ORG  Fri Sep 19 14:42:07 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0AE3016A4C2; Fri, 19 Sep 2003 14:42:07 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D36C416A4B3
	for <perforce@freebsd.org>; Fri, 19 Sep 2003 14:42:06 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8A15543FF9
	for <perforce@freebsd.org>; Fri, 19 Sep 2003 14:42:05 -0700 (PDT)
	(envelope-from Hrishikesh_Dandekar@NAI.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8JLg5XJ058546
	for <perforce@freebsd.org>; Fri, 19 Sep 2003 14:42:05 -0700 (PDT)
	(envelope-from Hrishikesh_Dandekar@NAI.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8JLg4wK058543
	for perforce@freebsd.org; Fri, 19 Sep 2003 14:42:04 -0700 (PDT)
	(envelope-from Hrishikesh_Dandekar@NAI.com)
Date: Fri, 19 Sep 2003 14:42:04 -0700 (PDT)
Message-Id: <200309192142.h8JLg4wK058543@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	Hrishikesh_Dandekar@NAI.com using -f
From: Hrishikesh Dandekar <hdandeka@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38294 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Sep 2003 21:42:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=38294

Change 38294 by hdandeka@hdandeka_yash on 2003/09/19 14:41:20

	Bug fix.

Affected files ...

.. //depot/projects/trustedbsd/mac/lib/libc/sys/sem.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/mac/lib/libc/sys/sem.c#6 (text+ko) ====

@@ -117,25 +117,18 @@
 	if (pshared != 0) {
 		if ((retval = ksem_init(&semid, value))) {
 			errno = retval;
-			retval = -1;
-			goto RETURN;
+			return (-1);
 		}
 		got_system_sem = 1;
 	}
 
 	(*sem) = sem_alloc(value, semid, got_system_sem);
-	if ((*sem) == NULL)
-		retval = -1;
-	else
-		retval = 0;
-  RETURN:
-	if (retval != 0 && got_system_sem)
-		if ((retval = ksem_destroy(semid))) {
-			errno = retval;
-			retval = -1;
-		}
-
-	return retval;
+	if ((*sem) == NULL) {
+		errno = ENOSPC;
+		ksem_destroy(semid);
+		return (-1);
+	}
+	return (0);
 }
 
 int
@@ -224,10 +217,7 @@
 	return (sem);
 err:
 	_pthread_mutex_unlock(&named_sems_mtx);
-	if ((retval = ksem_close(semid))) {
-		errno = retval;
-		return (SEM_FAILED);
-	}
+	ksem_close(semid);
 	if (sem != NULL) {
 		if (*sem != NULL)
 			sem_free(*sem);
@@ -286,7 +276,9 @@
 			errno = retval;
 			return (-1);
 		}
+		return (0);
 	}
+	retval = 0;
 
 	_pthread_mutex_lock(&(*sem)->lock);
 
@@ -299,8 +291,6 @@
 
 	_pthread_mutex_unlock(&(*sem)->lock);
 
-	retval = 0;
-  RETURN:
 	return retval;
 }
 
@@ -316,6 +306,7 @@
 			errno = retval;
 			return (-1);
 		}
+		return (0);
 	}
 
 	_pthread_mutex_lock(&(*sem)->lock);
@@ -330,7 +321,6 @@
 	
 	_pthread_mutex_unlock(&(*sem)->lock);
 
-  RETURN:
 	return retval;
 }
 
@@ -346,8 +336,10 @@
 			errno = retval;
 			return (-1);
 		}
+		return (0);
 	}
 
+	retval = 0;
 	_pthread_mutex_lock(&(*sem)->lock);
 
 	(*sem)->count++;
@@ -356,8 +348,6 @@
 
 	_pthread_mutex_unlock(&(*sem)->lock);
 
-	retval = 0;
-  RETURN:
 	return retval;
 }
 
@@ -373,13 +363,13 @@
 			errno = retval;
 			return (-1);
 		}
+		return (0);
 	}
 
+	retval = 0;
 	_pthread_mutex_lock(&(*sem)->lock);
 	*sval = (int)(*sem)->count;
 	_pthread_mutex_unlock(&(*sem)->lock);
 
-	retval = 0;
-  RETURN:
 	return retval;
 }