| 172 |
|
bpcmp(b1p, b2p) /* compare beam positions on disk */ |
| 173 |
|
int *b1p, *b2p; |
| 174 |
|
{ |
| 175 |
< |
register long pdif = beamdir[*b1p].fo - beamdir[*b2p].fo; |
| 175 |
> |
register off_t pdif = beamdir[*b1p].fo - beamdir[*b2p].fo; |
| 176 |
|
|
| 177 |
|
if (pdif < 0L) return(-1); |
| 178 |
|
return(pdif > 0L); |
| 190 |
|
int n; |
| 191 |
|
|
| 192 |
|
beamdir = hp->bi; /* sort based on file position */ |
| 193 |
< |
qsort((char *)bq, nb, sizeof(*bq), bpcmp); |
| 193 |
> |
qsort((void *)bq, nb, sizeof(*bq), bpcmp); |
| 194 |
|
/* transfer and free each beam */ |
| 195 |
|
for (i = 0; i < nb; i++) { |
| 196 |
|
bp = hdgetbeam(hp, bq[i]); |
| 197 |
|
DCHECK(bp==NULL, CONSISTENCY, "empty beam in xferclump"); |
| 198 |
|
n = dupchecking ? nuniq(hdbray(bp),bp->nrm) : bp->nrm; |
| 199 |
< |
bcopy((char *)hdbray(bp), (char *)hdnewrays(hout,bq[i],n), |
| 199 |
> |
bcopy((void *)hdbray(bp), (void *)hdnewrays(hout,bq[i],n), |
| 200 |
|
n*sizeof(RAYVAL)); |
| 201 |
|
hdfreebeam(hp, bq[i]); |
| 202 |
|
} |
