ViewVC Help

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

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

Comparing ray/src/hd/sm_usets.c (file contents):
Revision 3.2 by greg, Sat Feb 22 02:07:25 2003 UTC vs.
Revision 3.3 by greg, Wed Apr 23 00:52:34 2003 UTC

#	Line 46 | Line 46 | OBJECT  *oset;
46		osi = qtfreesets;
47		qtfreesets = (int)qtsettab[osi];
48		} else if ((osi = qtnumsets++) % QTSETIBLK == 0) {
49	<	qtsettab = (OBJECT **)realloc((char *)qtsettab,
49	>	qtsettab = (OBJECT **)realloc((void *)qtsettab,
50		(unsigned)(osi+QTSETIBLK)*sizeof(OBJECT *));
51		if (qtsettab == NULL)
52		goto memerr;
53	<	qtsetflag = (int4 *)realloc((char *)qtsetflag,
53	>	qtsetflag = (int4 *)realloc((void *)qtsetflag,
54		FLAG_BYTES(osi+ QTSETIBLK));
55		if (qtsetflag == NULL)
56		goto memerr;
#	Line 126 | Line 126 | OBJECT  id;
126		}
127		deletuelem(qtsettab[lf], id);
128		if (QTONTHRESH(qtsettab[lf][0]))
129	<	qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
129	>	qtsettab[lf] = (OBJECT *)realloc((void *)qtsettab[lf],
130		QTNODESIZ(qtsettab[lf][0])*sizeof(OBJECT));
131		return(qt);
132		}
#	Line 161 | Line 161 | OBJECT  id;
161		}
162		deletelem(qtsettab[lf], id);
163		if (QTONTHRESH(qtsettab[lf][0]))
164	<	qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
164	>	qtsettab[lf] = (OBJECT *)realloc((void *)qtsettab[lf],
165		QTNODESIZ(qtsettab[lf][0])*sizeof(OBJECT));
166		return(qt);
167		}
#	Line 198 | Line 198 | OBJECT  id;
198		return(qt);
199		}
200		if (QTONTHRESH(qtsettab[lf][0])) {
201	<	qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
201	>	qtsettab[lf] = (OBJECT *)realloc((void *)qtsettab[lf],
202		QTNODESIZ(qtsettab[lf][0]+1)*sizeof(OBJECT));
203		if (qtsettab[lf] == NULL)
204		error(SYSTEM, "out of memory in qtaddelem");
#	Line 230 | Line 230 | qtcompressuelem(qt,compress_set)
230		osize = os[0];
231		if((i=compress_set(os)) < osize)
232		{
233	<	qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
233	>	qtsettab[lf] = (OBJECT *)realloc((void *)qtsettab[lf],
234		QTNODESIZ(i+1)*sizeof(OBJECT));
235		if (qtsettab[lf] == NULL)
236		error(SYSTEM, "out of memory in qtaddelem");
#	Line 262 | Line 262 | OBJECT  id;
262		lf = QT_SET_INDEX(qt);
263		#endif
264		if (QTONTHRESH(qtsettab[lf][0])) {
265	<	qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
265	>	qtsettab[lf] = (OBJECT *)realloc((void *)qtsettab[lf],
266		QTNODESIZ(qtsettab[lf][0]+1)*sizeof(OBJECT));
267		if (qtsettab[lf] == NULL)
268		error(SYSTEM, "out of memory in qtaddelem");

Diff Legend

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