Various minor type, prototype tweaks -- clean up cruft due to lack of

type checking on entry points (to be introduced shortly).

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories

5 files changed, 10 insertions, 10 deletions

diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index 97de18a..93bec84 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -559,7 +559,7 @@ mac_biba_element_to_string(char *string, size_t size,
 				    "%d+", bit);
 		}
 		if (string[pos - 1] == '+' || string[pos - 1] == ':')
-			string[--pos] = NULL;
+			string[--pos] = '\0';
 		return (pos);
 
 	default:
@@ -1360,7 +1360,7 @@ mac_biba_create_cred(struct ucred *cred_parent, struct ucred *cred_child)
 
 static void
 mac_biba_execve_transition(struct ucred *old, struct ucred *new,
-    struct vnode *vp, struct mac *vnodelabel)
+    struct vnode *vp, struct label *vnodelabel)
 {
 	struct mac_biba *source, *dest;
 
@@ -1373,7 +1373,7 @@ mac_biba_execve_transition(struct ucred *old, struct ucred *new,
 
 static int
 mac_biba_execve_will_transition(struct ucred *old, struct vnode *vp,
-    struct mac *vnodelabel)
+    struct label *vnodelabel)
 {
 
 	return (0);
@@ -1802,7 +1802,7 @@ mac_biba_check_socket_deliver(struct socket *so, struct label *socketlabel,
 }
 
 static int
-mac_biba_check_socket_relabel(struct ucred *cred, struct socket *socket,
+mac_biba_check_socket_relabel(struct ucred *cred, struct socket *so,
     struct label *socketlabel, struct label *newlabel)
 {
 	struct mac_biba *subj, *obj, *new;
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c
index 23d5b7c..1435bba 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.c
+++ b/sys/security/mac_bsdextended/mac_bsdextended.c
@@ -459,8 +459,8 @@ mac_bsdextended_check_vnode_link(struct ucred *cred, struct vnode *dvp,
 	if (error)
 		return (error);
 	error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VWRITE);
-		if (error)  
-	return (error);
+	if (error)
+		return (error);
 
 	error = VOP_GETATTR(vp, &vap, cred, curthread);
 	if (error)
diff --git a/sys/security/mac_none/mac_none.c b/sys/security/mac_none/mac_none.c
index 3eef294..e5c3027 100644
--- a/sys/security/mac_none/mac_none.c
+++ b/sys/security/mac_none/mac_none.c
@@ -477,7 +477,7 @@ mac_none_check_cred_visible(struct ucred *u1, struct ucred *u2)
 
 static int
 mac_none_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet,
-    struct label *newlabel)
+    struct label *ifnetlabel, struct label *newlabel)
 {
 
 	return (0);
diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c
index 3eef294..e5c3027 100644
--- a/sys/security/mac_stub/mac_stub.c
+++ b/sys/security/mac_stub/mac_stub.c
@@ -477,7 +477,7 @@ mac_none_check_cred_visible(struct ucred *u1, struct ucred *u2)
 
 static int
 mac_none_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet,
-    struct label *newlabel)
+    struct label *ifnetlabel, struct label *newlabel)
 {
 
 	return (0);
diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c
index a422d27..9c26415 100644
--- a/sys/security/mac_test/mac_test.c
+++ b/sys/security/mac_test/mac_test.c
@@ -484,8 +484,8 @@ mac_test_externalize_label(struct label *label, char *element_name,
 }
 
 static int
-mac_test_internalize_label(struct label *label, struct mac *mac,
-    char *element_name, char *element_data, int *claimed)
+mac_test_internalize_label(struct label *label, char *element_name,
+    char *element_data, int *claimed)
 {
 
 	atomic_add_int(&internalize_count, 1);