9 |
|
|
10 |
|
#include "copyright.h" |
11 |
|
|
12 |
+ |
#include <string.h> |
13 |
+ |
|
14 |
|
#include "platform.h" |
15 |
|
#include "ray.h" |
16 |
|
#include "otypes.h" |
529 |
|
|
530 |
|
if ((av = newambval()) == NULL) |
531 |
|
error(SYSTEM, "out of memory in avstore"); |
532 |
< |
copystruct(av, aval); |
532 |
> |
*av = *aval; |
533 |
|
av->latick = ambclock; |
534 |
|
av->next = NULL; |
535 |
|
nambvals++; |
564 |
|
} |
565 |
|
atp = atfreelist; |
566 |
|
atfreelist = atp->kid; |
567 |
< |
bzero((char *)atp, 8*sizeof(AMBTREE)); |
567 |
> |
memset((char *)atp, '\0', 8*sizeof(AMBTREE)); |
568 |
|
return(atp); |
569 |
|
} |
570 |
|
|
741 |
|
if (avlist2 != NULL) |
742 |
|
free((void *)avlist2); |
743 |
|
if (always) { /* rebuild without sorting */ |
744 |
< |
copystruct(&oldatrunk, &atrunk); |
744 |
> |
oldatrunk = atrunk; |
745 |
|
atrunk.alist = NULL; |
746 |
|
atrunk.kid = NULL; |
747 |
|
unloadatree(&oldatrunk, avinsert); |
772 |
|
if (avlist1[i].p == NULL) |
773 |
|
continue; |
774 |
|
tap = avlist2[i]; |
775 |
< |
copystruct(&tav, tap); |
775 |
> |
tav = *tap; |
776 |
|
for (j = i; (pnext = avlist1[j].p) != tap; |
777 |
|
j = avlmemi(pnext)) { |
778 |
< |
copystruct(avlist2[j], pnext); |
778 |
> |
*(avlist2[j]) = *pnext; |
779 |
|
avinsert(avlist2[j]); |
780 |
|
avlist1[j].p = NULL; |
781 |
|
} |
782 |
< |
copystruct(avlist2[j], &tav); |
782 |
> |
*(avlist2[j]) = tav; |
783 |
|
avinsert(avlist2[j]); |
784 |
|
avlist1[j].p = NULL; |
785 |
|
} |