22 |
|
static double getflt(); |
23 |
|
static long getint(); |
24 |
|
static char *getstr(); |
25 |
+ |
static int getobj(), octerror(); |
26 |
|
static OCTREE getfullnode(), gettree(); |
27 |
|
|
28 |
|
static char *infn; /* input file name */ |
44 |
|
int nf; |
45 |
|
OBJECT fnobjects; |
46 |
|
register int i; |
47 |
+ |
long m; |
48 |
|
|
49 |
|
if (fname == NULL) { |
50 |
|
infn = "standard input"; |
85 |
|
if (load & IO_FILES) |
86 |
|
ofn[nf] = NULL; |
87 |
|
/* get number of objects */ |
88 |
< |
fnobjects = getint(objsize); |
88 |
> |
fnobjects = m = getint(objsize); |
89 |
> |
if (fnobjects != m) |
90 |
> |
octerror(USER, "too many objects"); |
91 |
|
|
92 |
|
if (load & IO_TREE) { |
93 |
|
/* get the octree */ |
139 |
|
register int i; |
140 |
|
register long m; |
141 |
|
|
142 |
< |
m = getint(objsize); |
139 |
< |
if (m > MAXSET) |
142 |
> |
if ((set[0] = getint(objsize)) > MAXSET) |
143 |
|
octerror(USER, "bad set in getfullnode"); |
141 |
– |
set[0] = m; |
144 |
|
for (i = 1; i <= set[0]; i++) { |
145 |
|
m = getint(objsize) + objorig; |
146 |
< |
if ((OBJECT)m != m) |
146 |
> |
if ((set[i] = m) != m) |
147 |
|
octerror(USER, "too many objects"); |
146 |
– |
set[i] = m; |
148 |
|
} |
149 |
|
return(fullnode(set)); |
150 |
|
} |
253 |
|
objp->oargs.iarg = NULL; |
254 |
|
#endif |
255 |
|
if (objp->oargs.nfargs = getint(2)) { |
256 |
< |
objp->oargs.farg = (double *)bmalloc |
257 |
< |
(objp->oargs.nfargs*sizeof(double)); |
256 |
> |
objp->oargs.farg = (FLOAT *)bmalloc |
257 |
> |
(objp->oargs.nfargs*sizeof(FLOAT)); |
258 |
|
if (objp->oargs.farg == NULL) |
259 |
|
goto memerr; |
260 |
|
for (i = 0; i < objp->oargs.nfargs; i++) |