PERFORCE change 20167 for review

Robert Watson rwatson at freebsd.org
Fri Oct 25 22:14:19 GMT 2002


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

Change 20167 by rwatson at rwatson_tislabs on 2002/10/25 15:13:29

	More vertical whitespace compression for merge.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#331 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#331 (text+ko) ====

@@ -3121,7 +3121,6 @@
 		return (error);
 
 	elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
-
 	error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL);
 	if (error) {
 		free(elements, M_MACTEMP);
@@ -3129,7 +3128,6 @@
 	}
 
 	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
-
 	error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
 	    buffer, mac.m_buflen, M_WAITOK);
 	if (error == 0)
@@ -3159,7 +3157,6 @@
 		return (error);
 
 	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK);
-
 	error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL);
 	if (error) {
 		free(buffer, M_MACTEMP);
@@ -3695,7 +3692,6 @@
 	}
 
 	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
-
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3705,7 +3701,6 @@
 
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
-
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
 	    mac.m_buflen, M_WAITOK);
 
@@ -3752,7 +3747,6 @@
 	}
 
 	buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
-
 	mtx_lock(&Giant);				/* VFS */
 	NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p,
 	    td);
@@ -3762,10 +3756,8 @@
 
 	mac_init_vnode_label(&intlabel);
 	mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
-
 	error = mac_externalize_vnode_label(&intlabel, elements, buffer,
 	    mac.m_buflen, M_WAITOK);
-
 	NDFREE(&nd, 0);
 	mac_destroy_vnode_label(&intlabel);
 
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list