--- ray/src/common/readfargs.c	1993/09/08 09:12:36	2.5
+++ ray/src/common/readfargs.c	2003/02/25 02:47:21	2.8
@@ -1,35 +1,19 @@
-/* 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 <math.h>
+#include "standard.h"
 
-#include "fvect.h"
-
 #include "object.h"
 
 
-#ifndef  MEMHOG
-#define  bmalloc	malloc
-#endif
 
-#ifdef  DCL_ATOF
-extern double  atof();
-#endif
-
-extern char  *bmalloc(), *savestr(), *fgetword();
-extern int  atoi();
-extern long  atol();
-
-
+int
 readfargs(fa, fp)		/* read function arguments from stream */
 register FUNARGS  *fa;
 FILE  *fp;
@@ -43,7 +27,7 @@ FILE  *fp;
 	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++) {
@@ -57,7 +41,7 @@ FILE  *fp;
 		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++) {
@@ -74,7 +58,7 @@ FILE  *fp;
 	if (!getint(sbuf) || (n = atoi(sbuf)) < 0)
 		return(0);
 	if (fa->nfargs = n) {
-		fa->farg = (FLOAT *)bmalloc(n*sizeof(FLOAT));
+		fa->farg = (FLOAT *)malloc(n*sizeof(FLOAT));
 		if (fa->farg == NULL)
 			return(-1);
 		for (i = 0; i < n; i++) {
@@ -91,7 +75,7 @@ FILE  *fp;
 }
 
 
-#ifndef  MEMHOG
+void
 freefargs(fa)			/* free object arguments */
 register FUNARGS  *fa;
 {
@@ -100,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