--- ray/src/common/readobj.c	1990/09/18 09:53:35	1.5
+++ ray/src/common/readobj.c	1991/07/19 09:25:43	1.6
@@ -70,6 +70,7 @@ FILE  *fp;
 {
 	OBJECT  obj;
 	char  sbuf[MAXSTR];
+	int  rval;
 	register OBJREC  *objp;
 
 	if ((obj = newobject()) == OVOID)
@@ -106,69 +107,18 @@ FILE  *fp;
 		}
 		objp->otype = objptr(alias)->otype;
 		copystruct(&objp->oargs, &objptr(alias)->oargs);
-	} else if (readfargs(&objp->oargs, fp) < 0) {
+	} else if ((rval = readfargs(&objp->oargs, fp)) == 0) {
 		sprintf(errmsg, "(%s): bad arguments", name);
 		objerror(objp, USER, errmsg);
+	} else if (rval < 0) {
+		sprintf(errmsg, "(%s): error reading scene", name);
+		error(SYSTEM, errmsg);
 	}
 					/* initialize */
 	objp->os = NULL;
 	objp->lastrno = -1;
 
 	insertobject(obj);		/* add to global structure */
-}
-
-
-readfargs(fa, fp)		/* read function arguments from stream */
-register FUNARGS  *fa;
-FILE  *fp;
-{
-	char  sbuf[MAXSTR];
-	int  n;
-	register int  i;
-
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(-1);
-	if (fa->nsargs = n) {
-		fa->sarg = (char **)bmalloc(n*sizeof(char *));
-		if (fa->sarg == NULL)
-			goto memerr;
-		for (i = 0; i < fa->nsargs; i++) {
-			if (fscanf(fp, "%s", sbuf) != 1)
-				return(-1);
-			fa->sarg[i] = savestr(sbuf);
-		}
-	} else
-		fa->sarg = NULL;
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(-1);
-#ifdef  IARGS
-	if (fa->niargs = n) {
-		fa->iarg = (long *)bmalloc(n*sizeof(long));
-		if (fa->iarg == NULL)
-			goto memerr;
-		for (i = 0; i < n; i++)
-			if (fscanf(fp, "%ld", &fa->iarg[i]) != 1)
-				return(-1);
-	} else
-		fa->iarg = NULL;
-#else
-	if (n != 0)
-		return(-1);
-#endif
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(-1);
-	if (fa->nfargs = n) {
-		fa->farg = (double *)bmalloc(n*sizeof(double));
-		if (fa->farg == NULL)
-			goto memerr;
-		for (i = 0; i < n; i++)
-			if (fscanf(fp, "%lf", &fa->farg[i]) != 1)
-				return(-1);
-	} else
-		fa->farg = NULL;
-	return(0);
-memerr:
-	error(SYSTEM, "out of memory in readfargs");
 }