--- ray/src/common/readfargs.c	1991/07/19 09:24:41	1.1
+++ ray/src/common/readfargs.c	2003/02/25 02:47:21	2.8
@@ -1,81 +1,82 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: readfargs.c,v 2.8 2003/02/25 02:47:21 greg Exp $";
 #endif
-
 /*
  * Allocate, read and free object arguments
  */
 
-#include <stdio.h>
+#include "copyright.h"
 
+#include "standard.h"
+
 #include "object.h"
 
 
-extern char  *savestr(), *malloc();
 
-#ifdef  MEMHOG
-extern char  *bmalloc();
-#else
-#define  bmalloc	malloc
-#endif
-
-
+int
 readfargs(fa, fp)		/* read function arguments from stream */
 register FUNARGS  *fa;
 FILE  *fp;
 {
+#define getstr(s)	(fgetword(s,sizeof(s),fp)!=NULL)
+#define getint(s)	(getstr(s) && isint(s))
+#define getflt(s)	(getstr(s) && isflt(s))
 	char  sbuf[MAXSTR];
-	int  n;
-	register int  i;
+	register int  n, i;
 
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
+	if (!getint(sbuf) || (n = atoi(sbuf)) < 0)
 		return(0);
 	if (fa->nsargs = n) {
-		fa->sarg = (char **)bmalloc(n*sizeof(char *));
+		fa->sarg = (char **)malloc(n*sizeof(char *));
 		if (fa->sarg == NULL)
 			return(-1);
 		for (i = 0; i < fa->nsargs; i++) {
-			if (fscanf(fp, "%s", sbuf) != 1)
+			if (!getstr(sbuf))
 				return(0);
 			fa->sarg[i] = savestr(sbuf);
 		}
 	} else
 		fa->sarg = NULL;
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
+	if (!getint(sbuf) || (n = atoi(sbuf)) < 0)
 		return(0);
 #ifdef  IARGS
 	if (fa->niargs = n) {
-		fa->iarg = (long *)bmalloc(n*sizeof(long));
+		fa->iarg = (long *)malloc(n*sizeof(long));
 		if (fa->iarg == NULL)
 			return(-1);
-		for (i = 0; i < n; i++)
-			if (fscanf(fp, "%ld", &fa->iarg[i]) != 1)
+		for (i = 0; i < n; i++) {
+			if (!getint(sbuf))
 				return(0);
+			fa->iarg[i] = atol(sbuf);
+		}
 	} else
 		fa->iarg = NULL;
 #else
 	if (n != 0)
 		return(0);
 #endif
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
+	if (!getint(sbuf) || (n = atoi(sbuf)) < 0)
 		return(0);
 	if (fa->nfargs = n) {
-		fa->farg = (double *)bmalloc(n*sizeof(double));
+		fa->farg = (FLOAT *)malloc(n*sizeof(FLOAT));
 		if (fa->farg == NULL)
 			return(-1);
-		for (i = 0; i < n; i++)
-			if (fscanf(fp, "%lf", &fa->farg[i]) != 1)
+		for (i = 0; i < n; i++) {
+			if (!getflt(sbuf))
 				return(0);
+			fa->farg[i] = atof(sbuf);
+		}
 	} else
 		fa->farg = NULL;
 	return(1);
+#undef getflt
+#undef getint
+#undef getstr
 }
 
 
-#ifndef  MEMHOG
-freefargs(fa)		/* free object arguments */
+void
+freefargs(fa)			/* free object arguments */
 register FUNARGS  *fa;
 {
 	register int  i;
@@ -83,13 +84,20 @@ register FUNARGS  *fa;
 	if (fa->nsargs) {
 		for (i = 0; i < fa->nsargs; i++)
 			freestr(fa->sarg[i]);
-		free((char *)fa->sarg);
+		free((void *)fa->sarg);
+		fa->sarg = NULL;
+		fa->nsargs = 0;
 	}
 #ifdef  IARGS
-	if (fa->niargs)
-		free((char *)fa->iarg);
+	if (fa->niargs) {
+		free((void *)fa->iarg);
+		fa->iarg = NULL;
+		fa->niargs = 0;
+	}
 #endif
-	if (fa->nfargs)
-		free((char *)fa->farg);
+	if (fa->nfargs) {
+		free((void *)fa->farg);
+		fa->farg = NULL;
+		fa->nfargs = 0;
+	}
 }
-#endif