--- ray/src/common/readfargs.c	1993/05/18 09:26:05	2.3
+++ ray/src/common/readfargs.c	2014/06/12 22:12:20	2.11
@@ -1,46 +1,34 @@
-/* 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.11 2014/06/12 22:12:20 greg Exp $";
 #endif
-
 /*
  * Allocate, read and free object arguments
  */
 
-#include <stdio.h>
+#include "copyright.h"
 
-#include "fvect.h"
+#include "standard.h"
 
 #include "object.h"
 
 
-#ifndef  MEMHOG
-#define  bmalloc	malloc
-#endif
 
-extern char  *bmalloc(), *savestr(), *fgetword();
-#ifndef atof
-extern double  atof();
-#endif
-extern int  atoi();
-extern long  atol();
-
-
-readfargs(fa, fp)		/* read function arguments from stream */
-register FUNARGS  *fa;
-FILE  *fp;
+int
+readfargs(			/* read function arguments from stream */
+	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];
-	register int  n, i;
+	int  n, i;
 
 	if (!getint(sbuf) || (n = atoi(sbuf)) < 0)
 		return(0);
-	if (fa->nsargs = n) {
-		fa->sarg = (char **)bmalloc(n*sizeof(char *));
+	if ( (fa->nsargs = n) ) {
+		fa->sarg = (char **)malloc(n*sizeof(char *));
 		if (fa->sarg == NULL)
 			return(-1);
 		for (i = 0; i < fa->nsargs; i++) {
@@ -54,7 +42,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++) {
@@ -70,8 +58,8 @@ FILE  *fp;
 #endif
 	if (!getint(sbuf) || (n = atoi(sbuf)) < 0)
 		return(0);
-	if (fa->nfargs = n) {
-		fa->farg = (FLOAT *)bmalloc(n*sizeof(FLOAT));
+	if ( (fa->nfargs = n) ) {
+		fa->farg = (RREAL *)malloc(n*sizeof(RREAL));
 		if (fa->farg == NULL)
 			return(-1);
 		for (i = 0; i < n; i++) {
@@ -88,22 +76,30 @@ FILE  *fp;
 }
 
 
-#ifndef  MEMHOG
-freefargs(fa)			/* free object arguments */
-register FUNARGS  *fa;
+void
+freefargs(				/* free object arguments */
+	FUNARGS  *fa
+)
 {
-	register int  i;
+	int  i;
 
 	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