The big 4.4BSD Lite to FreeBSD 2.0.0 (Development) patch.

Reviewed by:	Rodney W. Grimes
Submitted by:	John Dyson and David Greenman

3 files changed, 5 insertions, 6 deletions

diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 77947d1..ea4f804 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -49,9 +49,7 @@
 #include <sys/queue.h>
 #include <miscfs/union/union.h>
 
-#ifdef DIAGNOSTIC
 #include <sys/proc.h>
-#endif
 
 /* must be power of two, otherwise change UNION_HASH() */
 #define NHASH 32
@@ -71,6 +69,7 @@ union_init()
 	for (i = 0; i < NHASH; i++)
 		LIST_INIT(&unhead[i]);
 	bzero((caddr_t) unvplock, sizeof(unvplock));
+	return (0);
 }
 
 static int
@@ -223,10 +222,10 @@ union_allocvp(vpp, mp, undvp, dvp, cnp, uppervp, lowervp)
 	struct vnode *lowervp;		/* may be null */
 {
 	int error;
-	struct union_node *un;
+	struct union_node *un = 0;
 	struct union_node **pp;
 	struct vnode *xlowervp = NULLVP;
-	int hash;
+	int hash = 0;
 	int try;
 
 	if (uppervp == NULLVP && lowervp == NULLVP)
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index 9fa2746..42931d7 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -73,7 +73,7 @@ union_mount(mp, path, data, ndp, p)
 	struct ucred *cred = 0;
 	struct ucred *scred;
 	struct vattr va;
-	char *cp;
+	char *cp = 0;
 	int len;
 	u_int size;
 
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index 96327b0..30f2233 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -162,7 +162,7 @@ union_lookup(ap)
 	int lockparent = cnp->cn_flags & LOCKPARENT;
 	int rdonly = cnp->cn_flags & RDONLY;
 	struct union_mount *um = MOUNTTOUNIONMOUNT(dvp->v_mount);
-	struct ucred *saved_cred;
+	struct ucred *saved_cred = 0;
 
 	cnp->cn_flags |= LOCKPARENT;