| 39 |
|
static int objsize; /* size of stored OBJECT's */ |
| 40 |
|
static short otypmap[NUMOTYPE+8]; /* object type map */ |
| 41 |
|
|
| 42 |
< |
static unsigned long imhash(mod) char *mod; {return((unsigned long)mod);} |
| 42 |
> |
static unsigned long imhash(const char *mod) {return((unsigned long)mod);} |
| 43 |
|
static LUTAB imtab = {imhash,NULL,NULL,NULL,0,NULL,0}; |
| 44 |
|
|
| 45 |
|
static LUTAB ottab = LU_SINIT(free,free); |
| 147 |
|
path = getpath(name, getrlibpath(), R_OK); |
| 148 |
|
if (path == NULL) { |
| 149 |
|
sprintf(errmsg, "cannot find octree \"%s\"", name); |
| 150 |
< |
error(USER, errmsg); |
| 150 |
> |
error(SYSTEM, errmsg); |
| 151 |
|
} |
| 152 |
|
op = (OCTINST *)(lp->data = (char *)malloc(sizeof(OCTINST))); |
| 153 |
|
strcpy(op->octfile, path); |
| 376 |
|
(*ofun[ob.otype].funp)(&ob); |
| 377 |
|
/* record material if modifier */ |
| 378 |
|
if (ismodifier(ob.otype)) { |
| 379 |
< |
if ((lep = lu_find(&imtab, (char *)nobjects)) == NULL) |
| 379 |
> |
if ((lep = lu_find(&imtab, (char *)(size_t)nobjects)) == NULL) |
| 380 |
|
goto memerr; |
| 381 |
< |
lep->key = (char *)nobjects; |
| 381 |
> |
lep->key = (char *)(size_t)nobjects; |
| 382 |
|
lep->data = (char *)getmatp(ob.oname); |
| 383 |
|
} |
| 384 |
|
freefargs(&ob.oargs); /* free arguments */ |
