d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trim extraneous #else and #endif MAC comments per style(9).

Browse Source
This commit is contained in:
rwatson 2002-10-28 21:17:53 +00:00
parent bea9f656ab
commit 23cda0df02
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/uipc_socket.c
View File

@ -1265,7 +1265,7 @@ sosetopt(so, sopt)
u_long val;
#ifdef MAC
struct mac extmac;
#endif /* MAC */
#endif
error = 0;
if (sopt->sopt_level != SOL_SOCKET) {
@ -1400,9 +1400,9 @@ sosetopt(so, sopt)
error = mac_setsockopt_label_set(
sopt->sopt_td->td_ucred, so, &extmac);
#else /* MAC */
#else
error = EOPNOTSUPP;
#endif /* MAC */
#endif
break;
default:
error = ENOPROTOOPT;
@ -1462,7 +1462,7 @@ sogetopt(so, sopt)
#endif
#ifdef MAC
struct mac extmac;
#endif /* MAC */
#endif
error = 0;
if (sopt->sopt_level != SOL_SOCKET) {
@ -1551,9 +1551,9 @@ sogetopt(so, sopt)
if (error)
return (error);
error = sooptcopyout(sopt, &extmac, sizeof extmac);
#else /* MAC */
#else
error = EOPNOTSUPP;
#endif /* MAC */
#endif
break;
case SO_PEERLABEL:
#ifdef MAC
@ -1562,9 +1562,9 @@ sogetopt(so, sopt)
if (error)
return (error);
error = sooptcopyout(sopt, &extmac, sizeof extmac);
#else /* MAC */
#else
error = EOPNOTSUPP;
#endif /* MAC */
#endif
break;
default:
error = ENOPROTOOPT;

2
sys/kern/uipc_usrreq.c
View File

@ -644,7 +644,7 @@ unp_bind(unp, nam, td)
#ifdef MAC
error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd,
&vattr);
#endif /* MAC */
#endif
if (error == 0) {
VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE);
error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);