PERFORCE change 47804 for review

[Robert Watson]

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

Change 47804 by rwatson at 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