--- ray/src/hd/holofile.c	2003/05/29 16:26:21	3.46
+++ ray/src/hd/holofile.c	2003/07/07 17:21:50	3.50
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: holofile.c,v 3.46 2003/05/29 16:26:21 greg Exp $";
+static const char	RCSid[] = "$Id: holofile.c,v 3.50 2003/07/07 17:21:50 greg Exp $";
 #endif
 /*
  * Routines for managing holodeck files
@@ -7,6 +7,10 @@ static const char	RCSid[] = "$Id: holofile.c,v 3.46 20
  *	9/30/97	GWLarson
  */
 
+#include "copyright.h"
+
+#include <string.h>
+
 #include "holo.h"
 
 #ifndef CACHESIZE
@@ -66,7 +70,7 @@ HDGRID	*hproto;
 	register HOLO	*hp;
 	int	n;
 				/* copy grid to temporary header */
-	bcopy((void *)hproto, (void *)&hdhead, sizeof(HDGRID));
+	memcpy((void *)&hdhead, (void *)hproto, sizeof(HDGRID));
 				/* compute grid vectors and sizes */
 	hdcompgrid(&hdhead);
 				/* allocate header with directory */
@@ -81,13 +85,13 @@ HDGRID	*hproto;
 		free((void *)hp);
 		return(NULL);
 	}
-	bzero((void *)hp->bl, (nbeams(hp)+1)*sizeof(BEAM *)+sizeof(BEAM));
+	memset((void *)hp->bl, '\0', (nbeams(hp)+1)*sizeof(BEAM *)+sizeof(BEAM));
 	hp->bl[0] = (BEAM *)(hp->bl+nbeams(hp)+1);	/* set blglob(hp) */
 	hp->fd = -1;
 	hp->dirty = 0;
 	hp->priv = NULL;
 				/* clear beam directory */
-	bzero((void *)hp->bi, (nbeams(hp)+1)*sizeof(BEAMI));
+	memset((void *)hp->bi, '\0', (nbeams(hp)+1)*sizeof(BEAMI));
 	return(hp);		/* all is well */
 }
 
@@ -123,13 +127,13 @@ int	wr;
 	if (fd >= nhdfragls) {
 		hdfragl = (struct fraglist *)hdrealloc((char *)hdfragl,
 				(fd+1)*sizeof(struct fraglist), "hdattach");
-		bzero((void *)(hdfragl+nhdfragls),
-				(fd+1-nhdfragls)*sizeof(struct fraglist));
+		memset((void *)(hdfragl+nhdfragls),
+				'\0', (fd+1-nhdfragls)*sizeof(struct fraglist));
 		nhdfragls = fd+1;
 	}
 	hdfragl[fd].nlinks++;
 	hdfragl[fd].writable = wr;		/* set writable flag */
-	hdfragl[fd].flen = lseek(fd, (off_t)0L, 2);	/* get file length */
+	hdfragl[fd].flen = lseek(fd, (off_t)0, 2);	/* get file length */
 }
 
 
@@ -161,7 +165,7 @@ HDGRID	*hproto;		/* holodeck section grid */
 	register int	n;
 					/* prepare for system errors */
 	errno = 0;
-	if ((fpos = lseek(fd, (off_t)0L, 1)) < 0)
+	if ((fpos = lseek(fd, (off_t)0, 1)) < 0)
 		error(SYSTEM, "cannot determine holodeck file position");
 	if (hproto == NULL) {		/* assume we're loading it */
 		HDGRID	hpr;
@@ -355,9 +359,9 @@ int	fd;
 	if (fd < 0)
 		return(-1);
 	if (fd >= nhdfragls || !hdfragl[fd].nlinks) {
-		if ((fpos = lseek(fd, (off_t)0L, 1)) < 0)
+		if ((fpos = lseek(fd, (off_t)0, 1)) < 0)
 			return(-1);
-		flen = lseek(fd, (off_t)0L, 2);
+		flen = lseek(fd, (off_t)0, 2);
 		lseek(fd, fpos, 0);
 		return(flen);
 	}
@@ -429,7 +433,7 @@ int	nr;			/* number of new rays desired */
 		hdfreefrag(hp, i);		/* relinquish old fragment */
 	p = hdbray(hp->bl[i]) + hp->bl[i]->nrm;
 	hp->bl[i]->nrm += nr;			/* update in-core structure */
-	bzero((void *)p, nr*sizeof(RAYVAL));
+	memset((void *)p, '\0', nr*sizeof(RAYVAL));
 	blglob(hp)->tick = hp->bl[i]->tick = hdclock++;	/* update LRU clock */
 	return(p);				/* point to new rays */
 }
@@ -469,15 +473,15 @@ int
 hdfilord(hb1, hb2)	/* order beams for quick loading */
 register HDBEAMI	*hb1, *hb2;
 {
-	register long	c;
+	register off_t	c;
 				/* residents go first */
 	if (hb2->h->bl[hb2->b] != NULL)
 		return(hb1->h->bl[hb1->b] == NULL);
 	if (hb1->h->bl[hb1->b] != NULL)
 		return(-1);
 				/* otherwise sort by file descriptor */
-	if ((c = hb1->h->fd - hb2->h->fd))
-		return(c);
+	if (hb1->h->fd != hb2->h->fd)
+		return(hb1->h->fd - hb2->h->fd);
 				/* then by position in file */
 	c = hb1->h->bi[hb1->b].fo - hb2->h->bi[hb2->b].fo;
 	return(c > 0 ? 1 : c < 0 ? -1 : 0);
@@ -487,7 +491,7 @@ register HDBEAMI	*hb1, *hb2;
 hdloadbeams(hb, n, bf)	/* load a list of beams in optimal order */
 register HDBEAMI	*hb;	/* list gets sorted by hdfilord() */
 int	n;			/* list length */
-int	(*bf)();		/* callback function (optional) */
+void	(*bf)();		/* callback function (optional) */
 {
 	unsigned	origcachesize, memuse;
 	int	bytesloaded, needbytes, bytes2free;
@@ -602,7 +606,7 @@ int	i;
 		}
 	biglob(hp)->nrd -= bi->nrd;		/* tell fragment it's free */
 	bi->nrd = 0;
-	bi->fo = 0L;
+	bi->fo = 0;
 	hdmarkdirty(hp, i);			/* assume we'll reallocate */
 	return(1);
 }
@@ -612,7 +616,7 @@ int
 hdfragOK(fd, listlen, listsiz)	/* get fragment list status for file */
 int	fd;
 int	*listlen;
-register int4	*listsiz;
+register int32	*listsiz;
 {
 	register struct fraglist	*f;
 	register int	i;
@@ -635,7 +639,7 @@ register int4	*listsiz;
 off_t
 hdallocfrag(fd, nrays)		/* allocate a file fragment */
 int	fd;
-unsigned int4	nrays;
+uint32	nrays;
 {
 	register struct fraglist	*f;
 	register int	j;
@@ -667,7 +671,7 @@ register HOLO	*hp;
 register int	i;
 {
 	int	fragfreed;
-	unsigned int4	nrays;
+	uint32	nrays;
 	unsigned int	n;
 	off_t	nfo;
 					/* check file status */
@@ -693,7 +697,7 @@ register int	i;
 		}
 		hp->bi[i].fo = nfo;
 	} else
-		hp->bi[i].fo = 0L;
+		hp->bi[i].fo = 0;
 	biglob(hp)->nrd += nrays - hp->bi[i].nrd;
 	hp->bi[i].nrd = nrays;
 	if (!fragfreed)
@@ -781,7 +785,7 @@ register int	i;
 	if (hp->bi[i].nrd && !(hdfragflags&FF_KILL && hdfreefrag(hp,i))) {
 		biglob(hp)->nrd -= hp->bi[i].nrd;	/* free failed */
 		hp->bi[i].nrd = 0;
-		hp->bi[i].fo = 0L;
+		hp->bi[i].fo = 0;
 		hdmarkdirty(hp, i);
 	}
 	return(nchanged);