--- ray/src/ot/readobj2.c	2003/02/22 02:07:26	2.4
+++ ray/src/ot/readobj2.c	2004/03/27 12:41:45	2.9
@@ -1,25 +1,32 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: readobj2.c,v 2.4 2003/02/22 02:07:26 greg Exp $";
+static const char	RCSid[] = "$Id: readobj2.c,v 2.9 2004/03/27 12:41:45 schorsch Exp $";
 #endif
 /*
  *  readobj2.c - routines for reading in object descriptions.
  */
 
-#include  "standard.h"
+#include  <ctype.h>
+#include  <stdio.h>
 
+#include  "platform.h"
+#include  "rtprocess.h"
+#include  "rtmath.h"
+#include  "rtio.h"
+#include  "rterror.h"
 #include  "object.h"
-
 #include  "otypes.h"
+#include  "oconv.h"
 
-#include  <ctype.h>
 
-extern char  *fgetword();
+static void getobject2(char  *name, FILE  *fp, ro_cbfunc f);
 
-readobj2(input, callback)	/* read in an object file or stream */
-char  *input;
-int  (*callback)();
+
+void
+readobj2(	/* read in an object file or stream */
+	char  *input,
+	ro_cbfunc callback
+)
 {
-	FILE  *popen();
 	char  *fgetline();
 	FILE  *infp;
 	char  buf[512];
@@ -58,10 +65,12 @@ int  (*callback)();
 }
 
 
-getobject2(name, fp, f)			/* read the next object */
-char  *name;
-FILE  *fp;
-int  (*f)();
+static void
+getobject2(			/* read the next object */
+	char  *name,
+	FILE  *fp,
+	ro_cbfunc f
+)
 {
 	char  sbuf[MAXSTR];
 	OBJREC  thisobj;
@@ -70,9 +79,7 @@ int  (*f)();
 	thisobj.omod = OVOID;
 					/* get type */
 	fgetword(sbuf, MAXSTR, fp);
-	if (!strcmp(sbuf, ALIASID))
-		thisobj.otype = -1;
-	else if ((thisobj.otype = otype(sbuf)) < 0) {
+	if ((thisobj.otype = otype(sbuf)) < 0) {
 		sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
 		error(USER, errmsg);
 	}
@@ -80,7 +87,7 @@ int  (*f)();
 	fgetword(sbuf, MAXSTR, fp);
 	thisobj.oname = sbuf;
 					/* get arguments */
-	if (thisobj.otype == -1) {
+	if (thisobj.otype == MOD_ALIAS) {
 		fscanf(fp, "%*s");
 		return;
 	}