120 |
|
for (i = 0; i < nents; i++) |
121 |
|
if (clist[i].nr > n) |
122 |
|
n = clist[i].nr; |
123 |
< |
p = (PACKHEAD *)malloc(sizeof(PACKHEAD) + n*sizeof(RAYVAL)); |
123 |
> |
p = (PACKHEAD *)malloc(packsiz(n)); |
124 |
|
if (p == NULL) |
125 |
|
goto memerr; |
126 |
|
/* display what we have */ |
127 |
|
for (i = 0; i < nents; i++) |
128 |
|
if ((b = hdgetbeam(hdlist[clist[i].hd], clist[i].bi)) != NULL) { |
129 |
< |
bcopy((char *)hdbray(b), (char *)(p+1), |
129 |
> |
bcopy((char *)hdbray(b), (char *)packra(p), |
130 |
|
(p->nr=b->nrm)*sizeof(RAYVAL)); |
131 |
< |
disp_packet((PACKET *)p); |
131 |
> |
disp_packet(p); |
132 |
|
} |
133 |
|
free((char *)p); /* clean up */ |
134 |
|
return; |
272 |
|
done_packets(flush_queue()); |
273 |
|
if (complen <= 0) /* check to see if there is even a list */ |
274 |
|
return; |
275 |
< |
if (lastin < 0) /* flag to sort entire list */ |
275 |
> |
if (lastin < 0 || listpos*4 >= complen*3) |
276 |
|
qsort((char *)complist, complen, sizeof(PACKHEAD), beamcmp); |
277 |
|
else if (listpos) { /* else sort and merge sublist */ |
278 |
|
list2 = (PACKHEAD *)malloc(listpos*sizeof(PACKHEAD)); |