system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 14:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include <sys/malloc.h> instead of depending on namespace pollution 2

Browse source 
layers deep in <sys/proc.h> or <sys/vnode.h>.

Removed unused includes.

Fixed some printf format errors (1 fatal on i386's; 1 fatal on alphas;
1 not fatal on any supported machine).
This commit is contained in:
Bruce Evans 2002-09-05 07:02:43 +00:00
parent cd6d1d76b8
commit b656366b46
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=102949
9 changed files with 45 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/kern/kern_mac.c
View file

@ -51,8 +51,8 @@
#include <sys/extattr.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/mac.h>
#include <sys/module.h>
#include <sys/proc.h>
@ -66,7 +66,6 @@
#include <sys/socket.h>
#include <sys/pipe.h>
#include <sys/socketvar.h>
#include <sys/sx.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
@ -78,7 +77,6 @@
#include <fs/devfs/devfs.h>
#include <net/bpf.h>
#include <net/bpfdesc.h>
#include <net/if.h>
#include <net/if_var.h>
@ -2214,9 +2212,10 @@ mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred,
revokeperms = vme->max_protection & ~result;
if (!revokeperms)
continue;
printf("pid %d: revoking %s perms from %#lx:%d "
"(max %s/cur %s)\n", td->td_proc->p_pid,
prot2str(revokeperms), vme->start, vme->end - vme->start,
printf("pid %ld: revoking %s perms from %#lx:%ld "
"(max %s/cur %s)\n", (long)td->td_proc->p_pid,
prot2str(revokeperms), (u_long)vme->start,
(long)(vme->end - vme->start),
prot2str(vme->max_protection), prot2str(vme->protection));
vm_map_lock_upgrade(map);
/*

11
sys/security/mac/mac_framework.c
View file

@ -51,8 +51,8 @@
#include <sys/extattr.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/mac.h>
#include <sys/module.h>
#include <sys/proc.h>
@ -66,7 +66,6 @@
#include <sys/socket.h>
#include <sys/pipe.h>
#include <sys/socketvar.h>
#include <sys/sx.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
@ -78,7 +77,6 @@
#include <fs/devfs/devfs.h>
#include <net/bpf.h>
#include <net/bpfdesc.h>
#include <net/if.h>
#include <net/if_var.h>
@ -2214,9 +2212,10 @@ mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred,
revokeperms = vme->max_protection & ~result;
if (!revokeperms)
continue;
printf("pid %d: revoking %s perms from %#lx:%d "
"(max %s/cur %s)\n", td->td_proc->p_pid,
prot2str(revokeperms), vme->start, vme->end - vme->start,
printf("pid %ld: revoking %s perms from %#lx:%ld "
"(max %s/cur %s)\n", (long)td->td_proc->p_pid,
prot2str(revokeperms), (u_long)vme->start,
(long)(vme->end - vme->start),
prot2str(vme->max_protection), prot2str(vme->protection));
vm_map_lock_upgrade(map);
/*

11
sys/security/mac/mac_internal.h
View file

@ -51,8 +51,8 @@
#include <sys/extattr.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/mac.h>
#include <sys/module.h>
#include <sys/proc.h>
@ -66,7 +66,6 @@
#include <sys/socket.h>
#include <sys/pipe.h>
#include <sys/socketvar.h>
#include <sys/sx.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
@ -78,7 +77,6 @@
#include <fs/devfs/devfs.h>
#include <net/bpf.h>
#include <net/bpfdesc.h>
#include <net/if.h>
#include <net/if_var.h>
@ -2214,9 +2212,10 @@ mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred,
revokeperms = vme->max_protection & ~result;
if (!revokeperms)
continue;
printf("pid %d: revoking %s perms from %#lx:%d "
"(max %s/cur %s)\n", td->td_proc->p_pid,
prot2str(revokeperms), vme->start, vme->end - vme->start,
printf("pid %ld: revoking %s perms from %#lx:%ld "
"(max %s/cur %s)\n", (long)td->td_proc->p_pid,
prot2str(revokeperms), (u_long)vme->start,
(long)(vme->end - vme->start),
prot2str(vme->max_protection), prot2str(vme->protection));
vm_map_lock_upgrade(map);
/*

11
sys/security/mac/mac_net.c
View file

@ -51,8 +51,8 @@
#include <sys/extattr.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/mac.h>
#include <sys/module.h>
#include <sys/proc.h>
@ -66,7 +66,6 @@
#include <sys/socket.h>
#include <sys/pipe.h>
#include <sys/socketvar.h>
#include <sys/sx.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
@ -78,7 +77,6 @@
#include <fs/devfs/devfs.h>
#include <net/bpf.h>
#include <net/bpfdesc.h>
#include <net/if.h>
#include <net/if_var.h>
@ -2214,9 +2212,10 @@ mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred,
revokeperms = vme->max_protection & ~result;
if (!revokeperms)
continue;
printf("pid %d: revoking %s perms from %#lx:%d "
"(max %s/cur %s)\n", td->td_proc->p_pid,
prot2str(revokeperms), vme->start, vme->end - vme->start,
printf("pid %ld: revoking %s perms from %#lx:%ld "
"(max %s/cur %s)\n", (long)td->td_proc->p_pid,
prot2str(revokeperms), (u_long)vme->start,
(long)(vme->end - vme->start),
prot2str(vme->max_protection), prot2str(vme->protection));
vm_map_lock_upgrade(map);
/*

11
sys/security/mac/mac_pipe.c
View file

@ -51,8 +51,8 @@
#include <sys/extattr.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/mac.h>
#include <sys/module.h>
#include <sys/proc.h>
@ -66,7 +66,6 @@
#include <sys/socket.h>
#include <sys/pipe.h>
#include <sys/socketvar.h>
#include <sys/sx.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
@ -78,7 +77,6 @@
#include <fs/devfs/devfs.h>
#include <net/bpf.h>
#include <net/bpfdesc.h>
#include <net/if.h>
#include <net/if_var.h>
@ -2214,9 +2212,10 @@ mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred,
revokeperms = vme->max_protection & ~result;
if (!revokeperms)
continue;
printf("pid %d: revoking %s perms from %#lx:%d "
"(max %s/cur %s)\n", td->td_proc->p_pid,
prot2str(revokeperms), vme->start, vme->end - vme->start,
printf("pid %ld: revoking %s perms from %#lx:%ld "
"(max %s/cur %s)\n", (long)td->td_proc->p_pid,
prot2str(revokeperms), (u_long)vme->start,
(long)(vme->end - vme->start),
prot2str(vme->max_protection), prot2str(vme->protection));
vm_map_lock_upgrade(map);
/*

11
sys/security/mac/mac_process.c
View file

@ -51,8 +51,8 @@
#include <sys/extattr.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/mac.h>
#include <sys/module.h>
#include <sys/proc.h>
@ -66,7 +66,6 @@
#include <sys/socket.h>
#include <sys/pipe.h>
#include <sys/socketvar.h>
#include <sys/sx.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
@ -78,7 +77,6 @@
#include <fs/devfs/devfs.h>
#include <net/bpf.h>
#include <net/bpfdesc.h>
#include <net/if.h>
#include <net/if_var.h>
@ -2214,9 +2212,10 @@ mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred,
revokeperms = vme->max_protection & ~result;
if (!revokeperms)
continue;
printf("pid %d: revoking %s perms from %#lx:%d "
"(max %s/cur %s)\n", td->td_proc->p_pid,
prot2str(revokeperms), vme->start, vme->end - vme->start,
printf("pid %ld: revoking %s perms from %#lx:%ld "
"(max %s/cur %s)\n", (long)td->td_proc->p_pid,
prot2str(revokeperms), (u_long)vme->start,
(long)(vme->end - vme->start),
prot2str(vme->max_protection), prot2str(vme->protection));
vm_map_lock_upgrade(map);
/*

11
sys/security/mac/mac_syscalls.c
View file

@ -51,8 +51,8 @@
#include <sys/extattr.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/mac.h>
#include <sys/module.h>
#include <sys/proc.h>
@ -66,7 +66,6 @@
#include <sys/socket.h>
#include <sys/pipe.h>
#include <sys/socketvar.h>
#include <sys/sx.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
@ -78,7 +77,6 @@
#include <fs/devfs/devfs.h>
#include <net/bpf.h>
#include <net/bpfdesc.h>
#include <net/if.h>
#include <net/if_var.h>
@ -2214,9 +2212,10 @@ mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred,
revokeperms = vme->max_protection & ~result;
if (!revokeperms)
continue;
printf("pid %d: revoking %s perms from %#lx:%d "
"(max %s/cur %s)\n", td->td_proc->p_pid,
prot2str(revokeperms), vme->start, vme->end - vme->start,
printf("pid %ld: revoking %s perms from %#lx:%ld "
"(max %s/cur %s)\n", (long)td->td_proc->p_pid,
prot2str(revokeperms), (u_long)vme->start,
(long)(vme->end - vme->start),
prot2str(vme->max_protection), prot2str(vme->protection));
vm_map_lock_upgrade(map);
/*

11
sys/security/mac/mac_system.c
View file

@ -51,8 +51,8 @@
#include <sys/extattr.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/mac.h>
#include <sys/module.h>
#include <sys/proc.h>
@ -66,7 +66,6 @@
#include <sys/socket.h>
#include <sys/pipe.h>
#include <sys/socketvar.h>
#include <sys/sx.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
@ -78,7 +77,6 @@
#include <fs/devfs/devfs.h>
#include <net/bpf.h>
#include <net/bpfdesc.h>
#include <net/if.h>
#include <net/if_var.h>
@ -2214,9 +2212,10 @@ mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred,
revokeperms = vme->max_protection & ~result;
if (!revokeperms)
continue;
printf("pid %d: revoking %s perms from %#lx:%d "
"(max %s/cur %s)\n", td->td_proc->p_pid,
prot2str(revokeperms), vme->start, vme->end - vme->start,
printf("pid %ld: revoking %s perms from %#lx:%ld "
"(max %s/cur %s)\n", (long)td->td_proc->p_pid,
prot2str(revokeperms), (u_long)vme->start,
(long)(vme->end - vme->start),
prot2str(vme->max_protection), prot2str(vme->protection));
vm_map_lock_upgrade(map);
/*

11
sys/security/mac/mac_vfs.c
View file

@ -51,8 +51,8 @@
#include <sys/extattr.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/mac.h>
#include <sys/module.h>
#include <sys/proc.h>
@ -66,7 +66,6 @@
#include <sys/socket.h>
#include <sys/pipe.h>
#include <sys/socketvar.h>
#include <sys/sx.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
@ -78,7 +77,6 @@
#include <fs/devfs/devfs.h>
#include <net/bpf.h>
#include <net/bpfdesc.h>
#include <net/if.h>
#include <net/if_var.h>
@ -2214,9 +2212,10 @@ mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred,
revokeperms = vme->max_protection & ~result;
if (!revokeperms)
continue;
printf("pid %d: revoking %s perms from %#lx:%d "
"(max %s/cur %s)\n", td->td_proc->p_pid,
prot2str(revokeperms), vme->start, vme->end - vme->start,
printf("pid %ld: revoking %s perms from %#lx:%ld "
"(max %s/cur %s)\n", (long)td->td_proc->p_pid,
prot2str(revokeperms), (u_long)vme->start,
(long)(vme->end - vme->start),
prot2str(vme->max_protection), prot2str(vme->protection));
vm_map_lock_upgrade(map);
/*