7 |
|
* 11/4/98 Greg Ward Larson |
8 |
|
*/ |
9 |
|
|
10 |
– |
#include "holo.h" |
11 |
– |
|
10 |
|
#include <signal.h> |
11 |
+ |
#include <string.h> |
12 |
|
|
13 |
+ |
#include "rtprocess.h" /* getpid() */ |
14 |
+ |
#include "holo.h" |
15 |
+ |
|
16 |
|
#ifndef BKBSIZE |
17 |
|
#define BKBSIZE 256 /* beam clump size (kilobytes) */ |
18 |
|
#endif |
21 |
|
char tempfile[128]; |
22 |
|
int dupchecking = 0; |
23 |
|
|
22 |
– |
extern char *rindex(); |
24 |
|
extern long rhinitcopy(); |
25 |
|
|
26 |
|
|
53 |
|
error(SYSTEM, errmsg); |
54 |
|
} |
55 |
|
strcpy(tempfile, inpname); |
56 |
< |
if ((outname = rindex(tempfile, '/')) != NULL) |
56 |
> |
if ((outname = strrchr(tempfile, '/')) != NULL) |
57 |
|
outname++; |
58 |
|
else |
59 |
|
outname = tempfile; |
158 |
|
rva[i].r[1][0]==rva[j].r[1][0] && |
159 |
|
rva[i].r[1][1]==rva[j].r[1][1] ) { |
160 |
|
n--; /* swap duplicate with end */ |
161 |
< |
copystruct(&rtmp, rva+n); |
162 |
< |
copystruct(rva+n, rva+i); |
163 |
< |
copystruct(rva+i, &rtmp); |
161 |
> |
rtmp = *(rva+n); |
162 |
> |
*(rva+n) = *(rva+i); |
163 |
> |
*(rva+i) = rtmp; |
164 |
|
i--; /* recheck one we swapped */ |
165 |
|
} |
166 |
|
return(n); |
197 |
|
bp = hdgetbeam(hp, bq[i]); |
198 |
|
DCHECK(bp==NULL, CONSISTENCY, "empty beam in xferclump"); |
199 |
|
n = dupchecking ? nuniq(hdbray(bp),bp->nrm) : bp->nrm; |
200 |
< |
bcopy((void *)hdbray(bp), (void *)hdnewrays(hout,bq[i],n), |
200 |
> |
memcpy((void *)hdnewrays(hout,bq[i],n),(void *)hdbray(bp), |
201 |
|
n*sizeof(RAYVAL)); |
202 |
|
hdfreebeam(hp, bq[i]); |
203 |
|
} |