From owner-p4-projects@FreeBSD.ORG  Sat Feb 28 10:48:24 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 969D816A4D0; Sat, 28 Feb 2004 10:48:24 -0800 (PST)
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 6E7C716A4CE
	for <perforce@freebsd.org>; Sat, 28 Feb 2004 10:48:24 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6798843D1F
	for <perforce@freebsd.org>; Sat, 28 Feb 2004 10:48:24 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1SImOGe096591
	for <perforce@freebsd.org>; Sat, 28 Feb 2004 10:48:24 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1SImO8d096588
	for perforce@freebsd.org; Sat, 28 Feb 2004 10:48:24 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 28 Feb 2004 10:48:24 -0800 (PST)
Message-Id: <200402281848.i1SImO8d096588@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 47804 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: Sat, 28 Feb 2004 18:48:25 -0000

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

Change 47804 by rwatson@rwatson_tislabs on 2004/02/28 10:48:04

	At the risk of introducing some poor style in the netperf_socket
	branch, revert to the code layout in HEAD to minimize diffs.

Affected files ...

.. //depot/projects/netperf_socket/sys/kern/sys_socket.c#3 edit

Differences ...

==== //depot/projects/netperf_socket/sys/kern/sys_socket.c#3 (text+ko) ====

@@ -77,12 +77,15 @@
 	int flags;
 {
 	struct socket *so = fp->f_data;
+	int error;
+
 #ifdef MAC
-	int error = mac_check_socket_receive(active_cred, so);
+	error = mac_check_socket_receive(active_cred, so);
 	if (error)
 		return (error);
 #endif
-	return (so->so_proto->pr_usrreqs->pru_soreceive(so, 0, uio, 0, 0, 0));
+	error = so->so_proto->pr_usrreqs->pru_soreceive(so, 0, uio, 0, 0, 0);
+	return (error);
 }
 
 /* ARGSUSED */
@@ -95,13 +98,16 @@
 	int flags;
 {
 	struct socket *so = fp->f_data;
+	int error;
+
 #ifdef MAC
-	int error = mac_check_socket_send(active_cred, so);
+	error = mac_check_socket_send(active_cred, so);
 	if (error)
 		return (error);
 #endif
-	return (so->so_proto->pr_usrreqs->pru_sosend(so, 0, uio, 0, 0, 0,
-						    uio->uio_td));
+	error = so->so_proto->pr_usrreqs->pru_sosend(so, 0, uio, 0, 0, 0,
+						    uio->uio_td);
+	return (error);
 }
 
 int