diff options
| author | rwatson <rwatson@FreeBSD.org> | 2006-09-20 13:40:00 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2006-09-20 13:40:00 +0000 |
| commit | 41fdf2d4816062238e18e4acbe6cb02bafa47152 (patch) | |
| tree | a95db27364c48ef502c31a593a54ee36fedd5918 /sys/kern/sysv_msg.c | |
| parent | 5cab05d889422bcf74be149d485e3d0f181b3483 (diff) | |
| download | FreeBSD-src-41fdf2d4816062238e18e4acbe6cb02bafa47152.zip FreeBSD-src-41fdf2d4816062238e18e4acbe6cb02bafa47152.tar.gz | |
Remove MAC_DEBUG + MPRINTF debugging from System V IPC. This no longer
appears to be serving a useful purpose, as it was used during initial
development of MAC support for System V IPC.
MFC after: 1 month
Obtained from: TrustedBSD Project
Suggested by: Christopher dot Vance at SPARTA dot com
Diffstat (limited to 'sys/kern/sysv_msg.c')
| -rw-r--r-- | sys/kern/sysv_msg.c | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 4dea9e1..dca24de 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -81,11 +81,6 @@ static int sysvmsg_modload(struct module *, int, void *); #else #define DPRINTF(a) #endif -#ifdef MAC_DEBUG -#define MPRINTF(a) printf a -#else -#define MPRINTF(a) -#endif static void msg_freehdr(struct msg *msghdr); @@ -445,10 +440,8 @@ kern_msgctl(td, msqid, cmd, msqbuf) } #ifdef MAC error = mac_check_sysv_msqctl(td->td_ucred, msqkptr, cmd); - if (error != 0) { - MPRINTF(("mac_check_sysv_msqctl returned %d\n", error)); + if (error != 0) goto done2; - } #endif error = 0; @@ -475,11 +468,8 @@ kern_msgctl(td, msqid, cmd, msqbuf) for (msghdr = msqkptr->u.msg_first; msghdr != NULL; msghdr = msghdr->msg_next) { error = mac_check_sysv_msgrmid(td->td_ucred, msghdr); - if (error != 0) { - MPRINTF(("mac_check_sysv_msgrmid returned %d\n", - error)); + if (error != 0) goto done2; - } } #endif @@ -608,11 +598,8 @@ msgget(td, uap) } #ifdef MAC error = mac_check_sysv_msqget(cred, msqkptr); - if (error != 0) { - MPRINTF(("mac_check_sysv_msqget returned %d\n", - error)); + if (error != 0) goto done2; - } #endif goto found; } @@ -733,10 +720,8 @@ msgsnd(td, uap) #ifdef MAC error = mac_check_sysv_msqsnd(td->td_ucred, msqkptr); - if (error != 0) { - MPRINTF(("mac_check_sysv_msqsnd returned %d\n", error)); + if (error != 0) goto done2; - } #endif segs_needed = (msgsz + msginfo.msgssz - 1) / msginfo.msgssz; @@ -978,7 +963,6 @@ msgsnd(td, uap) */ error = mac_check_sysv_msgmsq(td->td_ucred, msghdr, msqkptr); if (error != 0) { - MPRINTF(("mac_check_sysv_msqmsq returned %d\n", error)); msg_freehdr(msghdr); wakeup(msqkptr); goto done2; @@ -1072,10 +1056,8 @@ msgrcv(td, uap) #ifdef MAC error = mac_check_sysv_msqrcv(td->td_ucred, msqkptr); - if (error != 0) { - MPRINTF(("mac_check_sysv_msqrcv returned %d\n", error)); + if (error != 0) goto done2; - } #endif msghdr = NULL; @@ -1094,11 +1076,8 @@ msgrcv(td, uap) #ifdef MAC error = mac_check_sysv_msgrcv(td->td_ucred, msghdr); - if (error != 0) { - MPRINTF(("mac_check_sysv_msgrcv " - "returned %d\n", error)); + if (error != 0) goto done2; - } #endif if (msqkptr->u.msg_first == msqkptr->u.msg_last) { msqkptr->u.msg_first = NULL; @@ -1142,12 +1121,8 @@ msgrcv(td, uap) #ifdef MAC error = mac_check_sysv_msgrcv( td->td_ucred, msghdr); - if (error != 0) { - MPRINTF(("mac_check_sysv_" - "msgrcv returned %d\n", - error)); + if (error != 0) goto done2; - } #endif *prev = msghdr->msg_next; if (msghdr == msqkptr->u.msg_last) { |
