ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/hd/holofile.c

Comparing ray/src/hd/holofile.c (file contents):
Revision 3.47 by greg, Fri Jun 13 15:27:04 2003 UTC vs.
Revision 3.50 by greg, Mon Jul 7 17:21:50 2003 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7		*      9/30/97 GWLarson
8		*/
9
10	+	#include "copyright.h"
11	+
12	+	#include <string.h>
13	+
14		#include "holo.h"
15
16		#ifndef CACHESIZE
#	Line 66 | Line 70 | HDGRID *hproto;
70		register HOLO   *hp;
71		int     n;
72		/* copy grid to temporary header */
73	<	bcopy((void *)hproto, (void *)&hdhead, sizeof(HDGRID));
73	>	memcpy((void *)&hdhead, (void *)hproto, sizeof(HDGRID));
74		/* compute grid vectors and sizes */
75		hdcompgrid(&hdhead);
76		/* allocate header with directory */
#	Line 81 | Line 85 | HDGRID *hproto;
85		free((void *)hp);
86		return(NULL);
87		}
88	<	bzero((void *)hp->bl, (nbeams(hp)+1)*sizeof(BEAM *)+sizeof(BEAM));
88	>	memset((void *)hp->bl, '\0', (nbeams(hp)+1)*sizeof(BEAM *)+sizeof(BEAM));
89		hp->bl[0] = (BEAM *)(hp->bl+nbeams(hp)+1);      /* set blglob(hp) */
90		hp->fd = -1;
91		hp->dirty = 0;
92		hp->priv = NULL;
93		/* clear beam directory */
94	<	bzero((void *)hp->bi, (nbeams(hp)+1)*sizeof(BEAMI));
94	>	memset((void *)hp->bi, '\0', (nbeams(hp)+1)*sizeof(BEAMI));
95		return(hp);             /* all is well */
96		}
97
#	Line 123 | Line 127 | int    wr;
127		if (fd >= nhdfragls) {
128		hdfragl = (struct fraglist *)hdrealloc((char *)hdfragl,
129		(fd+1)*sizeof(struct fraglist), "hdattach");
130	<	bzero((void *)(hdfragl+nhdfragls),
131	<	(fd+1-nhdfragls)*sizeof(struct fraglist));
130	>	memset((void *)(hdfragl+nhdfragls),
131	>	'\0', (fd+1-nhdfragls)*sizeof(struct fraglist));
132		nhdfragls = fd+1;
133		}
134		hdfragl[fd].nlinks++;
#	Line 429 | Line 433 | int    nr;                     /* number of new rays desired */
433		hdfreefrag(hp, i);              /* relinquish old fragment */
434		p = hdbray(hp->bl[i]) + hp->bl[i]->nrm;
435		hp->bl[i]->nrm += nr;                   /* update in-core structure */
436	<	bzero((void *)p, nr*sizeof(RAYVAL));
436	>	memset((void *)p, '\0', nr*sizeof(RAYVAL));
437		blglob(hp)->tick = hp->bl[i]->tick = hdclock++; /* update LRU clock */
438		return(p);                              /* point to new rays */
439		}
#	Line 487 | Line 491 | register HDBEAMI       *hb1, *hb2;
491		hdloadbeams(hb, n, bf)  /* load a list of beams in optimal order */
492		register HDBEAMI        *hb;    /* list gets sorted by hdfilord() */
493		int     n;                      /* list length */
494	<	int     (*bf)();                /* callback function (optional) */
494	>	void    (*bf)();                /* callback function (optional) */
495		{
496		unsigned        origcachesize, memuse;
497		int     bytesloaded, needbytes, bytes2free;
#	Line 612 | Line 616 | int
616		hdfragOK(fd, listlen, listsiz)  /* get fragment list status for file */
617		int     fd;
618		int     *listlen;
619	<	register int4   *listsiz;
619	>	register int32  *listsiz;
620		{
621		register struct fraglist        *f;
622		register int    i;
#	Line 635 | Line 639 | register int4  *listsiz;
639		off_t
640		hdallocfrag(fd, nrays)          /* allocate a file fragment */
641		int     fd;
642	<	unsigned int4   nrays;
642	>	uint32  nrays;
643		{
644		register struct fraglist        *f;
645		register int    j;
#	Line 667 | Line 671 | register HOLO  *hp;
671		register int    i;
672		{
673		int     fragfreed;
674	<	unsigned int4   nrays;
674	>	uint32  nrays;
675		unsigned int    n;
676		off_t   nfo;
677		/* check file status */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)