PERFORCE change 20165 for review
Robert Watson
rwatson at freebsd.org
Fri Oct 25 22:07:09 GMT 2002
http://perforce.freebsd.org/chv.cgi?CH=20165
Change 20165 by rwatson at rwatson_tislabs on 2002/10/25 15:06:33
Remove whitespace to prep for merge.
Affected files ...
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#330 edit
Differences ...
==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#330 (text+ko) ====
@@ -3243,7 +3243,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);
@@ -3298,7 +3297,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);
@@ -3306,7 +3304,6 @@
}
buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
-
error = mac_externalize_socket_label(&so->so_label, elements,
buffer, mac->m_buflen, M_WAITOK);
if (error == 0)
@@ -3330,7 +3327,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);
@@ -3448,7 +3444,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);
@@ -3457,7 +3452,6 @@
}
buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
-
error = mac_externalize_cred_label(&tcred->cr_label, elements,
buffer, mac.m_buflen, M_WAITOK);
if (error == 0)
@@ -3488,7 +3482,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);
@@ -3496,7 +3489,6 @@
}
buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
-
error = mac_externalize_cred_label(&td->td_ucred->cr_label,
elements, buffer, mac.m_buflen, M_WAITOK);
if (error == 0)
@@ -3529,7 +3521,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);
@@ -3607,7 +3598,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);
@@ -3615,7 +3605,6 @@
}
buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
-
mtx_lock(&Giant); /* VFS */
error = fget(td, SCARG(uap, fd), &fp);
if (error)
@@ -3699,7 +3688,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);
@@ -3757,7 +3745,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);
@@ -3818,7 +3805,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);
@@ -3905,7 +3891,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);
@@ -3962,7 +3947,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);
@@ -4047,7 +4031,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);
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