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

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

5 files changed, 27 insertions, 5 deletions

diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index 62d1d3f..36daffd 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -89,6 +89,7 @@ struct	nchstats iso_nchstats;
  *
  * NOTE: (LOOKUP | LOCKPARENT) currently returns the parent inode unlocked.
  */
+int
 cd9660_lookup(ap)
 	struct vop_lookup_args /* {
 		struct vnode *a_dvp;
@@ -100,9 +101,9 @@ cd9660_lookup(ap)
 	register struct iso_node *dp;	/* inode for directory being searched */
 	register struct iso_mnt *imp;	/* file system that directory is in */
 	struct buf *bp;			/* a buffer of directory entries */
-	struct iso_directory_record *ep;/* the current directory entry */
+	struct iso_directory_record *ep = 0;/* the current directory entry */
 	int entryoffsetinblock;		/* offset of ep in bp's buffer */
-	int saveoffset;			/* offset of last directory entry in dir */
+	int saveoffset = 0;		/* offset of last directory entry in dir */
 	int numdirpasses;		/* strategy for directory search */
 	doff_t endsearch;		/* offset to end directory search */
 	struct iso_node *pdp;		/* saved dp during symlink work */
@@ -443,6 +444,7 @@ found:
  * is non-zero, fill it in with a pointer to the
  * remaining space in the directory.
  */
+int
 iso_blkatoff(ip, offset, bpp)
 	struct iso_node *ip;
 	doff_t offset;
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index d83a7a6..f9641ff 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -84,6 +84,7 @@ int prtactive;	/* 1 => print out reclaim of active vnodes */
 /*
  * Initialize hash links for inodes and dnodes.
  */
+int
 cd9660_init()
 {
 	register int i;
@@ -102,6 +103,7 @@ cd9660_init()
 		dh->dh_head[1] = dh;
 	}
 #endif
+	return (0);
 }
 
 #ifdef	ISODEVMAP
@@ -163,9 +165,11 @@ iso_dunmap(dev)
  * return the inode locked. Detection and handling of mount
  * points must be done by the calling routine.
  */
+int
 iso_iget(xp, ino, relocated, ipp, isodir)
 	struct iso_node *xp;
 	ino_t ino;
+	int relocated;
 	struct iso_node **ipp;
 	struct iso_directory_record *isodir;
 {
@@ -338,6 +342,7 @@ loop:
 /*
  * Unlock and decrement the reference count of an inode structure.
  */
+int
 iso_iput(ip)
 	register struct iso_node *ip;
 {
@@ -346,6 +351,7 @@ iso_iput(ip)
 		panic("iso_iput");
 	ISO_IUNLOCK(ip);
 	vrele(ITOV(ip));
+	return (0);
 }
 
 /*
@@ -412,6 +418,7 @@ cd9660_reclaim(ap)
 /*
  * Lock an inode. If its already locked, set the WANT bit and sleep.
  */
+int
 iso_ilock(ip)
 	register struct iso_node *ip;
 {
@@ -426,11 +433,13 @@ iso_ilock(ip)
 	ip->i_spare1 = 0;
 	ip->i_spare0 = curproc->p_pid;
 	ip->i_flag |= ILOCKED;
+	return (0);
 }
 
 /*
  * Unlock an inode.  If WANT bit is on, wakeup.
  */
+int
 iso_iunlock(ip)
 	register struct iso_node *ip;
 {
@@ -443,6 +452,7 @@ iso_iunlock(ip)
 		ip->i_flag &= ~IWANT;
 		wakeup((caddr_t)ip);
 	}
+	return (0);
 }
 
 /*
diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c
index f74f051..39c5fe4 100644
--- a/sys/isofs/cd9660/cd9660_util.c
+++ b/sys/isofs/cd9660/cd9660_util.c
@@ -157,7 +157,7 @@ int
 isofncmp(unsigned char *fn,int fnlen,unsigned char *isofn,int isolen)
 {
 	int i, j;
-	char c;
+	unsigned char c;
 	
 	while (--fnlen >= 0) {
 		if (--isolen < 0)
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 02dd92a..bc48367 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -82,6 +82,7 @@ struct vfsops cd9660_vfsops = {
 
 static iso_mountfs();
 
+int
 cd9660_mountroot()
 {
 	register struct mount *mp;
@@ -139,6 +140,7 @@ int iso_doforce = 1;
  *
  * mount system call
  */
+int
 cd9660_mount(mp, path, data, ndp, p)
 	register struct mount *mp;
 	char *path;
@@ -150,7 +152,7 @@ cd9660_mount(mp, path, data, ndp, p)
 	struct iso_args args;
 	u_int size;
 	int error;
-	struct iso_mnt *imp;
+	struct iso_mnt *imp = 0;
 	
 	if (error = copyin(data, (caddr_t)&args, sizeof (struct iso_args)))
 		return (error);
@@ -211,7 +213,8 @@ cd9660_mount(mp, path, data, ndp, p)
 /*
  * Common code for mount and mountroot
  */
-static iso_mountfs(devvp, mp, p, argp)
+static int
+iso_mountfs(devvp, mp, p, argp)
 	register struct vnode *devvp;
 	struct mount *mp;
 	struct proc *p;
@@ -381,6 +384,7 @@ out:
  * Nothing to do at the moment.
  */
 /* ARGSUSED */
+int
 cd9660_start(mp, flags, p)
 	struct mount *mp;
 	int flags;
@@ -433,6 +437,7 @@ cd9660_unmount(mp, mntflags, p)
 /*
  * Return root of a filesystem
  */
+int
 cd9660_root(mp, vpp)
 	struct mount *mp;
 	struct vnode **vpp;
@@ -485,6 +490,7 @@ cd9660_quotactl(mp, cmd, uid, arg, p)
 /*
  * Get file system statistics.
  */
+int
 cd9660_statfs(mp, sbp, p)
 	struct mount *mp;
 	register struct statfs *sbp;
@@ -659,6 +665,7 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
  * Vnode pointer to File handle
  */
 /* ARGSUSED */
+int
 cd9660_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 59f5a73..7a2964b 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -157,6 +157,7 @@ cd9660_close(ap)
  * super user is granted all permissions.
  */
 /* ARGSUSED */
+int
 cd9660_access(ap)
 	struct vop_access_args /* {
 		struct vnode *a_vp;
@@ -168,6 +169,7 @@ cd9660_access(ap)
 	return (0);
 }
 
+int
 cd9660_getattr(ap)
 	struct vop_getattr_args /* {
 		struct vnode *a_vp;
@@ -217,6 +219,7 @@ extern int doclusterread;
 /*
  * Vnode op for reading.
  */
+int
 cd9660_read(ap)
 	struct vop_read_args /* {
 		struct vnode *a_vp;