git: caabd66799 - main - arch-handbook: rewrite MAC chapter K&R C prototypes

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/doc/commit/?id=caabd66799fdd31af769c956ca4aa0a7232d175a

commit caabd66799fdd31af769c956ca4aa0a7232d175a
Author:     Ed Maste <[email protected]>
AuthorDate: 2024-07-27 21:10:30 +0000
Commit:     Ed Maste <[email protected]>
CommitDate: 2024-07-28 20:09:11 +0000

    arch-handbook: rewrite MAC chapter K&R C prototypes
    
    K&R C has been deprecated for decades and is no longer valid C.
    
    Reported by:    https://101010.pl/@nabijaczleweli/112860058280711119
    Reviewed by:    lwhsu
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D46171
---
 .../content/en/books/arch-handbook/mac/_index.adoc | 1212 +++++---------------
 1 file changed, 258 insertions(+), 954 deletions(-)

diff --git a/documentation/content/en/books/arch-handbook/mac/_index.adoc b/documentation/content/en/books/arch-handbook/mac/_index.adoc
index a1f07c1fb8..1724ba0553 100644
--- a/documentation/content/en/books/arch-handbook/mac/_index.adoc
+++ b/documentation/content/en/books/arch-handbook/mac/_index.adoc
@@ -362,8 +362,7 @@ The exception to this is the process credential, which is assumed to be understo
 
 [source,c]
 ----
-void mpo_init(	conf);
-struct mac_policy_conf *conf;
+void mpo_init(struct mac_policy_conf *conf);
 ----
 
 [.informaltable]
@@ -387,8 +386,7 @@ If potentially sleeping memory allocations are required during policy initializa
 
 [source,c]
 ----
-void mpo_destroy(	conf);
-struct mac_policy_conf *conf;
+void mpo_destroy(struct mac_policy_conf *conf);
 ----
 
 [.informaltable]
@@ -411,12 +409,7 @@ The policy list mutex is held, so caution should be applied.
 
 [source,c]
 ----
-int mpo_syscall(	td,
- 	call,
- 	arg);
-struct thread *td;
-int call;
-void *arg;
+int mpo_syscall(struct thread *td, int call, void *arg);
 ----
 
 [.informaltable]
@@ -454,8 +447,7 @@ Modules must currently perform the `copyin()` of the syscall data on their own.
 
 [source,c]
 ----
-void mpo_thread_userret(	td);
-struct thread *td;
+void mpo_thread_userret(struct thread *td);
 ----
 
 [.informaltable]
@@ -484,8 +476,7 @@ Policy writers are cautioned that event ordering relating to scheduling an AST a
 
 [source,c]
 ----
-void mpo_init_bpfdesc_label(	label);
-struct label *label;
+void mpo_init_bpfdesc_label(struct label *label);
 ----
 
 [.informaltable]
@@ -508,8 +499,7 @@ Sleeping is permitted.
 
 [source,c]
 ----
-void mpo_init_cred_label(	label);
-struct label *label;
+void mpo_init_cred_label(struct label *label);
 ----
 
 [.informaltable]
@@ -532,8 +522,7 @@ Sleeping is permitted.
 
 [source,c]
 ----
-void mpo_init_devfsdirent_label(	label);
-struct label *label;
+void mpo_init_devfsdirent_label(struct label *label);
 ----
 
 [.informaltable]
@@ -556,8 +545,7 @@ Sleeping is permitted.
 
 [source,c]
 ----
-void mpo_init_ifnet_label(	label);
-struct label *label;
+void mpo_init_ifnet_label(struct label *label);
 ----
 
 [.informaltable]
@@ -580,10 +568,7 @@ Sleeping is permitted.
 
 [source,c]
 ----
-void mpo_init_ipq_label(	label,
- 	flag);
-struct label *label;
-int flag;
+void mpo_init_ipq_label(struct label *label, int flag);
 ----
 
 [.informaltable]
@@ -612,10 +597,7 @@ This entry point is permitted to fail resulting in the failure to allocate the I
 
 [source,c]
 ----
-void mpo_init_mbuf_label(	flag,
- 	label);
-int flag;
-struct label *label;
+void mpo_init_mbuf_label(int flag, struct label *label);
 ----
 
 [.informaltable]
@@ -644,10 +626,7 @@ This entry point is permitted to fail resulting in the failure to allocate the m
 
 [source,c]
 ----
-void mpo_init_mount_label(	mntlabel,
- 	fslabel);
-struct label *mntlabel;
-struct label *fslabel;
+void mpo_init_mount_label(struct label *mntlabel, struct label *fslabel);
 ----
 
 [.informaltable]
@@ -674,8 +653,7 @@ Sleeping is permitted.
 
 [source,c]
 ----
-void mpo_init_mount_fs_label(	label);
-struct label *label;
+void mpo_init_mount_fs_label(struct label *label);
 ----
 
 [.informaltable]
@@ -698,8 +676,7 @@ Sleeping is permitted
 
 [source,c]
 ----
-void mpo_init_pipe_label(	label);
-struct label*label;
+void mpo_init_pipe_label(struct label *label);
 ----
 
 [.informaltable]
@@ -722,10 +699,7 @@ Sleeping is permitted.
 
 [source,c]
 ----
-void mpo_init_socket_label(	label,
- 	flag);
-struct label *label;
-int flag;
+void mpo_init_socket_label(struct label *label, int flag);
 ----
 
 [.informaltable]
@@ -752,10 +726,7 @@ The `flag` field may be one of M_WAITOK and M_NOWAIT, and should be employed to
 
 [source,c]
 ----
-void mpo_init_socket_peer_label(	label,
- 	flag);
-struct label *label;
-int flag;
+void mpo_init_socket_peer_label(struct label *label, int flag);
 ----
 
 [.informaltable]
@@ -782,8 +753,7 @@ The `flag` field may be one of M_WAITOK and M_NOWAIT, and should be employed to
 
 [source,c]
 ----
-void mpo_init_proc_label(	label);
-struct label *label;
+void mpo_init_proc_label(struct label *label);
 ----
 
 [.informaltable]
@@ -806,8 +776,7 @@ Sleeping is permitted.
 
 [source,c]
 ----
-void mpo_init_vnode_label(	label);
-struct label *label;
+void mpo_init_vnode_label(struct label *label);
 ----
 
 [.informaltable]
@@ -830,8 +799,7 @@ Sleeping is permitted.
 
 [source,c]
 ----
-void mpo_destroy_bpfdesc_label(	label);
-struct label *label;
+void mpo_destroy_bpfdesc_label(struct label *label);
 ----
 
 [.informaltable]
@@ -854,8 +822,7 @@ In this entry point a policy should free any internal storage associated with `l
 
 [source,c]
 ----
-void mpo_destroy_cred_label(	label);
-struct label *label;
+void mpo_destroy_cred_label(struct label *label);
 ----
 
 [.informaltable]
@@ -878,8 +845,7 @@ In this entry point, a policy module should free any internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_devfsdirent_label(	label);
-struct label *label;
+void mpo_destroy_devfsdirent_label(struct label *label);
 ----
 
 [.informaltable]
@@ -902,8 +868,7 @@ In this entry point, a policy module should free any internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_ifnet_label(	label);
-struct label *label;
+void mpo_destroy_ifnet_label(struct label *label);
 ----
 
 [.informaltable]
@@ -926,8 +891,7 @@ In this entry point, a policy module should free any internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_ipq_label(	label);
-struct label *label;
+void mpo_destroy_ipq_label(struct label *label);
 ----
 
 [.informaltable]
@@ -950,8 +914,7 @@ In this entry point, a policy module should free any internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_mbuf_label(	label);
-struct label *label;
+void mpo_destroy_mbuf_label(struct label *label);
 ----
 
 [.informaltable]
@@ -974,8 +937,7 @@ In this entry point, a policy module should free any internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_mount_label(	label);
-struct label *label;
+void mpo_destroy_mount_label(struct label *label);
 ----
 
 [.informaltable]
@@ -998,10 +960,7 @@ In this entry point, a policy module should free the internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_mount_label(	mntlabel,
- 	fslabel);
-struct label *mntlabel;
-struct label *fslabel;
+void mpo_destroy_mount_label(struct label *mntlabel, struct label *fslabel);
 ----
 
 [.informaltable]
@@ -1028,8 +987,7 @@ In this entry point, a policy module should free the internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_socket_label(	label);
-struct label *label;
+void mpo_destroy_socket_label(struct label *label);
 ----
 
 [.informaltable]
@@ -1052,8 +1010,7 @@ In this entry point, a policy module should free any internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_socket_peer_label(	peerlabel);
-struct label *peerlabel;
+void mpo_destroy_socket_peer_label(struct label *peerlabel);
 ----
 
 [.informaltable]
@@ -1076,8 +1033,7 @@ In this entry point, a policy module should free any internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_pipe_label(	label);
-struct label *label;
+void mpo_destroy_pipe_label(struct label *label);
 ----
 
 [.informaltable]
@@ -1100,8 +1056,7 @@ In this entry point, a policy module should free any internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_proc_label(	label);
-struct label *label;
+void mpo_destroy_proc_label(struct label *label);
 ----
 
 [.informaltable]
@@ -1124,8 +1079,7 @@ In this entry point, a policy module should free any internal storage associated
 
 [source,c]
 ----
-void mpo_destroy_vnode_label(	label);
-struct label *label;
+void mpo_destroy_vnode_label(struct label *label);
 ----
 
 [.informaltable]
@@ -1148,10 +1102,7 @@ In this entry point, a policy module should free any internal storage associated
 
 [source,c]
 ----
-void mpo_copy_mbuf_label(	src,
- 	dest);
-struct label *src;
-struct label *dest;
+void mpo_copy_mbuf_label(struct label *src, struct label *dest);
 ----
 
 [.informaltable]
@@ -1177,10 +1128,7 @@ Copy the label information in `src` into `dest`.
 
 [source,c]
 ----
-void mpo_copy_pipe_label(	src,
- 	dest);
-struct label *src;
-struct label *dest;
+void mpo_copy_pipe_label(struct label *src, struct label *dest);
 ----
 
 [.informaltable]
@@ -1206,10 +1154,7 @@ Copy the label information in `src` into `dest`.
 
 [source,c]
 ----
-void mpo_copy_vnode_label(	src,
- 	dest);
-struct label *src;
-struct label *dest;
+void mpo_copy_vnode_label(struct label *src, struct label *dest);
 ----
 
 [.informaltable]
@@ -1235,14 +1180,8 @@ Copy the label information in `src` into `dest`.
 
 [source,c]
 ----
-int mpo_externalize_cred_label(	label,
- 	element_name,
- 	sb,
- 	*claimed);
-struct label *label;
-char *element_name;
-struct sbuf *sb;
-int *claimed;
+int mpo_externalize_cred_label(struct label *label, char *element_name,
+    struct sbuf *sb, int *claimed);
 ----
 
 [.informaltable]
@@ -1281,14 +1220,8 @@ Once the policy fills in `element_data`, `*claimed` should be incremented.
 
 [source,c]
 ----
-int mpo_externalize_ifnet_label(	label,
- 	element_name,
- 	sb,
- 	*claimed);
-struct label *label;
-char *element_name;
-struct sbuf *sb;
-int *claimed;
+int mpo_externalize_ifnet_label(struct label *label, char *element_name,
+    struct sbuf *sb, int *claimed);
 ----
 
 [.informaltable]
@@ -1327,14 +1260,8 @@ Once the policy fills in `element_data`, `*claimed` should be incremented.
 
 [source,c]
 ----
-int mpo_externalize_pipe_label(	label,
- 	element_name,
- 	sb,
- 	*claimed);
-struct label *label;
-char *element_name;
-struct sbuf *sb;
-int *claimed;
+int mpo_externalize_pipe_label(struct label *label, char *element_name,
+    struct sbuf *sb, int *claimed);
 ----
 
 [.informaltable]
@@ -1373,14 +1300,8 @@ Once the policy fills in `element_data`, `*claimed` should be incremented.
 
 [source,c]
 ----
-int mpo_externalize_socket_label(	label,
- 	element_name,
- 	sb,
- 	*claimed);
-struct label *label;
-char *element_name;
-struct sbuf *sb;
-int *claimed;
+int mpo_externalize_socket_label(struct label *label, char *element_name,
+    struct sbuf *sb, int *claimed);
 ----
 
 [.informaltable]
@@ -1419,14 +1340,8 @@ Once the policy fills in `element_data`, `*claimed` should be incremented.
 
 [source,c]
 ----
-int mpo_externalize_socket_peer_label(	label,
- 	element_name,
- 	sb,
- 	*claimed);
-struct label *label;
-char *element_name;
-struct sbuf *sb;
-int *claimed;
+int mpo_externalize_socket_peer_label(struct label *label, char *element_name,
+    struct sbuf *sb, int *claimed);
 ----
 
 [.informaltable]
@@ -1465,14 +1380,8 @@ Once the policy fills in `element_data`, `*claimed` should be incremented.
 
 [source,c]
 ----
-int mpo_externalize_vnode_label(	label,
- 	element_name,
- 	sb,
- 	*claimed);
-struct label *label;
-char *element_name;
-struct sbuf *sb;
-int *claimed;
+int mpo_externalize_vnode_label(struct label *label, char *element_name,
+    struct sbuf *sb, int *claimed);
 ----
 
 [.informaltable]
@@ -1511,14 +1420,8 @@ Once the policy fills in `element_data`, `*claimed` should be incremented.
 
 [source,c]
 ----
-int mpo_internalize_cred_label(	label,
- 	element_name,
- 	element_data,
- 	claimed);
-struct label *label;
-char *element_name;
-char *element_data;
-int *claimed;
+int mpo_internalize_cred_label(struct label *label, char *element_name,
+    char *element_data, int *claimed);
 ----
 
 [.informaltable]
@@ -1554,14 +1457,8 @@ Just as in the `externalize` entry points, the entry point should return 0 if `e
 
 [source,c]
 ----
-int mpo_internalize_ifnet_label(	label,
- 	element_name,
- 	element_data,
- 	claimed);
-struct label *label;
-char *element_name;
-char *element_data;
-int *claimed;
+int mpo_internalize_ifnet_label(struct label *label, char *element_name,
+    char *element_data, int *claimed);
 ----
 
 [.informaltable]
@@ -1597,14 +1494,8 @@ Just as in the `externalize` entry points, the entry point should return 0 if `e
 
 [source,c]
 ----
-int mpo_internalize_pipe_label(	label,
- 	element_name,
- 	element_data,
- 	claimed);
-struct label *label;
-char *element_name;
-char *element_data;
-int *claimed;
+int mpo_internalize_pipe_label(struct label *label, char *element_name,
+    char *element_data, int *claimed);
 ----
 
 [.informaltable]
@@ -1640,14 +1531,8 @@ Just as in the `externalize` entry points, the entry point should return 0 if `e
 
 [source,c]
 ----
-int mpo_internalize_socket_label(	label,
- 	element_name,
- 	element_data,
- 	claimed);
-struct label *label;
-char *element_name;
-char *element_data;
-int *claimed;
+int mpo_internalize_socket_label(struct label *label, char *element_name,
+    char *element_data, int *claimed);
 ----
 
 [.informaltable]
@@ -1683,14 +1568,8 @@ Just as in the `externalize` entry points, the entry point should return 0 if `e
 
 [source,c]
 ----
-int mpo_internalize_vnode_label(	label,
- 	element_name,
- 	element_data,
- 	claimed);
-struct label *label;
-char *element_name;
-char *element_data;
-int *claimed;
+int mpo_internalize_vnode_label(struct label *label, char *element_name,
+    char *element_data, int *claimed);
 ----
 
 [.informaltable]
@@ -1773,18 +1652,9 @@ These labels are initialized and destroyed as with other label types, but the cr
 
 [source,c]
 ----
-void mpo_associate_vnode_devfs(	mp,
- 	fslabel,
- 	de,
- 	delabel,
- 	vp,
- 	vlabel);
-struct mount *mp;
-struct label *fslabel;
-struct devfs_dirent *de;
-struct label *delabel;
-struct vnode *vp;
-struct label *vlabel;
+void mpo_associate_vnode_devfs(struct mount *mp, struct label *fslabel,
+    struct devfs_dirent *de, struct label *delabel, struct vnode *vp,
+    struct label *vlabel);
 ----
 
 [.informaltable]
@@ -1826,14 +1696,8 @@ Fill in the label (`vlabel`) for a newly created devfs vnode based on the devfs
 
 [source,c]
 ----
-int mpo_associate_vnode_extattr(	mp,
- 	fslabel,
- 	vp,
- 	vlabel);
-struct mount *mp;
-struct label *fslabel;
-struct vnode *vp;
-struct label *vlabel;
+int mpo_associate_vnode_extattr(struct mount *mp, struct label *fslabel,
+    struct vnode *vp, struct label *vlabel);
 ----
 
 [.informaltable]
@@ -1870,14 +1734,8 @@ In the event of an error, an appropriate value for `errno` should be returned.
 
 [source,c]
 ----
-void mpo_associate_vnode_singlelabel(	mp,
- 	fslabel,
- 	vp,
- 	vlabel);
-struct mount *mp;
-struct label *fslabel;
-struct vnode *vp;
-struct label *vlabel;
+void mpo_associate_vnode_singlelabel(struct mount *mp, struct label *fslabel,
+    struct vnode *vp, struct label *vlabel);
 ----
 
 [.informaltable]
@@ -1911,12 +1769,8 @@ On non-multilabel file systems, this entry point is called to set the policy lab
 
 [source,c]
 ----
-void mpo_create_devfs_device(	dev,
- 	devfs_dirent,
- 	label);
-dev_t dev;
-struct devfs_dirent *devfs_dirent;
-struct label *label;
+void mpo_create_devfs_device(dev_t dev, struct devfs_dirent *devfs_dirent,
+    struct label *label);
 ----
 
 [.informaltable]
@@ -1947,14 +1801,8 @@ This call will be made when the device file system is mounted, regenerated, or a
 
 [source,c]
 ----
-void mpo_create_devfs_directory(	dirname,
- 	dirnamelen,
- 	devfs_dirent,
- 	label);
-char *dirname;
-int dirnamelen;
-struct devfs_dirent *devfs_dirent;
-struct label *label;
+void mpo_create_devfs_directory(char *dirname, int dirnamelen,
+    struct devfs_dirent *devfs_dirent, struct label *label);
 ----
 
 [.informaltable]
@@ -1985,18 +1833,9 @@ This call will be made when the device file system is mounted, regenerated, or a
 
 [source,c]
 ----
-void mpo_create_devfs_symlink(	cred,
- 	mp,
- 	dd,
- 	ddlabel,
- 	de,
- 	delabel);
-struct ucred *cred;
-struct mount *mp;
-struct devfs_dirent *dd;
-struct label *ddlabel;
-struct devfs_dirent *de;
-struct label *delabel;
+void mpo_create_devfs_symlink(struct ucred *cred, struct mount *mp,
+    struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de,
+    struct label *delabel);
 ----
 
 [.informaltable]
@@ -2038,22 +1877,9 @@ Fill in the label (`delabel`) for a newly created man:devfs[5] symbolic link ent
 
 [source,c]
 ----
-int mpo_create_vnode_extattr(	cred,
- 	mp,
- 	fslabel,
- 	dvp,
- 	dlabel,
- 	vp,
- 	vlabel,
- 	cnp);
-struct ucred *cred;
-struct mount *mp;
-struct label *fslabel;
-struct vnode *dvp;
-struct label *dlabel;
-struct vnode *vp;
-struct label *vlabel;
-struct componentname *cnp;
+int mpo_create_vnode_extattr(struct ucred *cred, struct mount *mp,
+    struct label *fslabel, struct vnode *dvp, struct label *dlabel,
+    struct vnode *vp, struct label *vlabel, struct componentname *cnp);
 ----
 
 [.informaltable]
@@ -2105,14 +1931,8 @@ Otherwise, return an appropriate error.
 
 [source,c]
 ----
-void mpo_create_mount(	cred,
- 	mp,
- 	mnt,
- 	fslabel);
-struct ucred *cred;
-struct mount *mp;
-struct label *mnt;
-struct label *fslabel;
+void mpo_create_mount(struct ucred *cred, struct mount *mp, struct label *mnt,
+    struct label *fslabel);
 ----
 
 [.informaltable]
@@ -2147,14 +1967,8 @@ This call will be made when a new file system is mounted.
 
 [source,c]
 ----
-void mpo_create_root_mount(	cred,
- 	mp,
- 	mntlabel,
- 	fslabel);
-struct ucred *cred;
-struct mount *mp;
-struct label *mntlabel;
-struct label *fslabel;
+void mpo_create_root_mount(struct ucred *cred, struct mount *mp,
+    struct label *mntlabel, struct label *fslabel);
 ----
 
 [.informaltable]
@@ -2175,14 +1989,8 @@ This call will be made when the root file system is mounted, after `mpo_create_m
 
 [source,c]
 ----
-void mpo_relabel_vnode(	cred,
- 	vp,
- 	vnodelabel,
- 	newlabel);
-struct ucred *cred;
-struct vnode *vp;
-struct label *vnodelabel;
-struct label *newlabel;
+void mpo_relabel_vnode(struct ucred *cred, struct vnode *vp,
+    struct label *vnodelabel, struct label *newlabel);
 ----
 
 [.informaltable]
@@ -2216,14 +2024,8 @@ Update the label on the passed vnode given the passed update vnode label and the
 
 [source,c]
 ----
-int mpo_setlabel_vnode_extattr(	cred,
- 	vp,
- 	vlabel,
- 	intlabel);
-struct ucred *cred;
-struct vnode *vp;
-struct label *vlabel;
-struct label *intlabel;
+int mpo_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp,
+    struct label *vlabel, struct label *intlabel);
 ----
 
 [.informaltable]
@@ -2258,14 +2060,8 @@ This is called from `vop_stdcreatevnode_ea`.
 
 [source,c]
 ----
-void mpo_update_devfsdirent(	devfs_dirent,
- 	direntlabel,
- 	vp,
- 	vnodelabel);
-struct devfs_dirent *devfs_dirent;
-struct label *direntlabel;
-struct vnode *vp;
-struct label *vnodelabel;
+void mpo_update_devfsdirent(struct devfs_dirent *devfs_dirent,
+    struct label *direntlabel, struct vnode *vp, struct label *vnodelabel);
 ----
 
 [.informaltable]
@@ -2305,14 +2101,8 @@ It will also be made when a symlink is created in devfs, following a call to `ma
 
 [source,c]
 ----
-void mpo_create_mbuf_from_socket(	so,
- 	socketlabel,
- 	m,
- 	mbuflabel);
-struct socket *so;
-struct label *socketlabel;
-struct mbuf *m;
-struct label *mbuflabel;
+void mpo_create_mbuf_from_socket(struct socket *so, struct label *socketlabel,
+    struct mbuf *m, struct label *mbuflabel);
 ----
 
 [.informaltable]
@@ -2347,12 +2137,8 @@ This call is made when a new datagram or message is generated by the socket and
 
 [source,c]
 ----
-void mpo_create_pipe(	cred,
- 	pipe,
- 	pipelabel);
-struct ucred *cred;
-struct pipe *pipe;
-struct label *pipelabel;
+void mpo_create_pipe(struct ucred *cred, struct pipe *pipe,
+    struct label *pipelabel);
 ----
 
 [.informaltable]
@@ -2383,12 +2169,8 @@ This call is made when a new pipe is created.
 
 [source,c]
 ----
-void mpo_create_socket(	cred,
- 	so,
- 	socketlabel);
-struct ucred *cred;
-struct socket *so;
-struct label *socketlabel;
+void mpo_create_socket(struct ucred *cred, struct socket *so,
+    struct label *socketlabel);
 ----
 
 [.informaltable]
@@ -2419,14 +2201,9 @@ This call is made when a socket is created.
 
 [source,c]
 ----
-void mpo_create_socket_from_socket(	oldsocket,
- 	oldsocketlabel,
- 	newsocket,
- 	newsocketlabel);
-struct socket *oldsocket;
-struct label *oldsocketlabel;
-struct socket *newsocket;
-struct label *newsocketlabel;
+void mpo_create_socket_from_socket(struct socket *oldsocket,
+    struct label *oldsocketlabel, struct socket *newsocket,
+    struct label *newsocketlabel);
 ----
 
 [.informaltable]
@@ -2460,14 +2237,8 @@ Label a socket, `newsocket`, newly man:accept[2]ed, based on the man:listen[2] s
 
 [source,c]
 ----
-void mpo_relabel_pipe(	cred,
- 	pipe,
- 	oldlabel,
- 	newlabel);
-struct ucred *cred;
-struct pipe *pipe;
-struct label *oldlabel;
-struct label *newlabel;
+void mpo_relabel_pipe(struct ucred *cred, struct pipe *pipe,
+    struct label *oldlabel, struct label *newlabel);
 ----
 
 [.informaltable]
@@ -2501,14 +2272,8 @@ Apply a new label, `newlabel`, to `pipe`.
 
 [source,c]
 ----
-void mpo_relabel_socket(	cred,
- 	so,
- 	oldlabel,
- 	newlabel);
-struct ucred *cred;
-struct socket *so;
-struct label *oldlabel;
-struct label *newlabel;
+void mpo_relabel_socket(struct ucred *cred, struct socket *so,
+    struct label *oldlabel, struct label *newlabel);
 ----
 
 [.informaltable]
@@ -2542,14 +2307,8 @@ Update the label on a socket from the passed socket label update.
 
 [source,c]
 ----
-void mpo_set_socket_peer_from_mbuf(	mbuf,
- 	mbuflabel,
- 	oldlabel,
- 	newlabel);
-struct mbuf *mbuf;
-struct label *mbuflabel;
-struct label *oldlabel;
-struct label *newlabel;
+void mpo_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel,
+    struct label *oldlabel, struct label *newlabel);
 ----
 
 [.informaltable]
@@ -2584,14 +2343,9 @@ This call will be made when the first datagram is received by the stream socket,
 
 [source,c]
 ----
-void mpo_set_socket_peer_from_socket(	oldsocket,
- 	oldsocketlabel,
- 	newsocket,
- 	newsocketpeerlabel);
-struct socket *oldsocket;
-struct label *oldsocketlabel;
-struct socket *newsocket;
-struct label *newsocketpeerlabel;
+void mpo_set_socket_peer_from_socket(struct socket *oldsocket,
+    struct label *oldsocketlabel, struct socket *newsocket,
+    struct label *newsocketpeerlabel);
 ----
 
 [.informaltable]
@@ -2629,12 +2383,8 @@ This call will be made when the socket pair is connected, and will be made for b
 
 [source,c]
 ----
-void mpo_create_bpfdesc(	cred,
- 	bpf_d,
- 	bpflabel);
-struct ucred *cred;
-struct bpf_d *bpf_d;
-struct label *bpflabel;
+void mpo_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d,
+    struct label *bpflabel);
 ----
 
 [.informaltable]
@@ -2665,10 +2415,7 @@ This call will be made when a BPF device node is opened by a process with the pa
 
 [source,c]
 ----
-void mpo_create_ifnet(	ifnet,
- 	ifnetlabel);
-struct ifnet *ifnet;
-struct label *ifnetlabel;
+void mpo_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel);
 ----
 
 [.informaltable]
@@ -2695,14 +2442,8 @@ This call may be made when a new physical interface becomes available to the sys
 
 [source,c]
 ----
-void mpo_create_ipq(	fragment,
- 	fragmentlabel,
- 	ipq,
- 	ipqlabel);
-struct mbuf *fragment;
-struct label *fragmentlabel;
-struct ipq *ipq;
-struct label *ipqlabel;
+void mpo_create_ipq(struct mbuf *fragment, struct label *fragmentlabel,
+    struct ipq *ipq, struct label *ipqlabel);
 ----
 
 [.informaltable]
@@ -2736,14 +2477,8 @@ Set the label on a newly created IP fragment reassembly queue from the mbuf head
 
 [source,c]
 ----
-void mpo_create_create_datagram_from_ipq(	ipq,
- 	ipqlabel,
- 	datagram,
- 	datagramlabel);
-struct ipq *ipq;
-struct label *ipqlabel;
-struct mbuf *datagram;
-struct label *datagramlabel;
+void mpo_create_create_datagram_from_ipq(struct ipq *ipq,
+    struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel);
 ----
 
 [.informaltable]
@@ -2777,14 +2512,8 @@ Set the label on a newly reassembled IP datagram from the IP fragment reassembly
 
 [source,c]
 ----
-void mpo_create_fragment(	datagram,
*** 1302 LINES SKIPPED ***