From owner-p4-projects@FreeBSD.ORG  Thu Jun 29 14:41:06 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C95E16A5BC; Thu, 29 Jun 2006 14:41:06 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 D62FB16A563
	for <perforce@freebsd.org>; Thu, 29 Jun 2006 14:41:05 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A5BC444C3B
	for <perforce@freebsd.org>; Thu, 29 Jun 2006 14:18:54 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TEIsIV068852
	for <perforce@freebsd.org>; Thu, 29 Jun 2006 14:18:54 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TEIsLF068849
	for perforce@freebsd.org; Thu, 29 Jun 2006 14:18:54 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 29 Jun 2006 14:18:54 GMT
Message-Id: <200606291418.k5TEIsLF068849@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100289 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 29 Jun 2006 14:41:06 -0000

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

Change 100289 by jhb@jhb_mutex on 2006/06/29 14:18:32

	Compile and other nits.

Affected files ...

.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#26 edit
.. //depot/projects/smpng/sys/kern/kern_prot.c#95 edit

Differences ...

==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#26 (text+ko) ====

@@ -653,7 +653,8 @@
 {
 	ibcs2_gid_t iset[NGROUPS_MAX];
 	gid_t gp[NGROUPS_MAX];
-	int error, i, ngrp;
+	u_int i, ngrp;
+	int error;
 
 	if (uap->gidsetsize < 0)
 		return (EINVAL);

==== //depot/projects/smpng/sys/kern/kern_prot.c#95 (text+ko) ====

@@ -300,7 +300,8 @@
 getgroups(struct thread *td, register struct getgroups_args *uap)
 {
 	gid_t groups[NGROUPS];
-	int error, ngrp;
+	u_int ngrp;
+	int error;
 
         ngrp = MIN(uap->gidsetsize, NGROUPS);
 	error = kern_getgroups(td, &ngrp, groups);
@@ -317,7 +318,6 @@
 kern_getgroups(struct thread *td, u_int *ngrp, gid_t *groups)
 {
 	struct ucred *cred;
-	int error;
 
 	cred = td->td_ucred;
 	if (*ngrp == 0) {
@@ -327,7 +327,7 @@
 	if (*ngrp < cred->cr_ngroups)
 		return (EINVAL);
 	*ngrp = cred->cr_ngroups;
-	bcopy(cred->cr_groups, gidset, ngrp * sizeof(gid_t));
+	bcopy(cred->cr_groups, groups, *ngrp * sizeof(gid_t));
 	return (0);
 }