--- ray/src/common/readoct.c 1992/09/21 12:04:17 2.7 +++ ray/src/common/readoct.c 1994/08/29 14:20:37 2.11 @@ -21,7 +21,7 @@ static char SCCSid[] = "$SunId$ LBL"; static double ogetflt(); static long ogetint(); static char *ogetstr(); -static int getobj(), octerror(); +static int getobj(), octerror(), skiptree(); static OCTREE getfullnode(), gettree(); static char *infn; /* input file name */ @@ -38,7 +38,6 @@ int load; CUBE *scene; char *ofn[]; { - extern int fputs(); char sbuf[512]; int nf; OBJECT fnobjects; @@ -60,7 +59,7 @@ char *ofn[]; setmode(fileno(infp), O_BINARY); #endif /* get header */ - if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0) + if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0) octerror(USER, "not an octree"); /* check format */ if ((objsize = ogetint(2)-OCTMAGIC) <= 0 || @@ -280,7 +279,6 @@ getobj() /* get next object */ objp->oargs.farg = NULL; /* initialize */ objp->os = NULL; - objp->lastrno = -1; /* insert */ insertobject(obj); return(obj);