--- ray/src/common/loadvars.c	2003/02/25 02:47:21	2.10
+++ ray/src/common/loadvars.c	2023/06/05 16:32:42	2.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: loadvars.c,v 2.10 2003/02/25 02:47:21 greg Exp $";
+static const char	RCSid[] = "$Id: loadvars.c,v 2.18 2023/06/05 16:32:42 greg Exp $";
 #endif
 /*
  *  Routines for loading and checking variables from file.
@@ -10,6 +10,8 @@ static const char	RCSid[] = "$Id: loadvars.c,v 2.10 20
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+
+#include "standard.h"
 #include "vars.h"
 
 #define NOCHAR	127		/* constant for character to delete */
@@ -18,12 +20,13 @@ extern char  *fgetline();
 
 
 void
-loadvars(rfname)		/* load variables into vv from file */
-char	*rfname;
+loadvars(			/* load variables into vv from file */
+	const char	*rfname
+)
 {
 	FILE	*fp;
 	char	buf[512];
-	register char	*cp;
+	char	*cp;
 
 	if (rfname == NULL)
 		fp = stdin;
@@ -51,20 +54,22 @@ char	*rfname;
 			quit(1);
 		}
 	}
-	fclose(fp);
+	if (fp != stdin)
+		fclose(fp);
 }
 
 
 int
-setvariable(ass, mv)		/* assign variable according to string */
-register char	*ass;
-VARIABLE	*(*mv)();
+setvariable(			/* assign variable according to string */
+	const char	*ass,
+	VARIABLE	*(*mv)(const char*)
+)
 {
 	char	varname[32];
 	int	n;
-	register char	*cp;
-	register VARIABLE	*vp;
-	register int	i;
+	char	*cp;
+	VARIABLE	*vp;
+	int	i;
 
 	while (isspace(*ass))		/* skip leading space */
 		ass++;
@@ -88,13 +93,13 @@ VARIABLE	*(*mv)();
 	if (vp == NULL)
 		return(-1);
 					/* assign new value */
-	if (i = vp->nass) {
+	if ( (i = vp->nass) ) {
 		cp = vp->value;
 		while (i--)
 			while (*cp++)
 				;
 		i = cp - vp->value;
-		vp->value = (char *)realloc(vp->value, i+n+1);
+		vp->value = (char *)realloc((void *)vp->value, i+n+1);
 	} else
 		vp->value = (char *)malloc(n+1);
 	if (vp->value == NULL) {
@@ -118,11 +123,12 @@ VARIABLE	*(*mv)();
 
 
 VARIABLE *
-matchvar(nam)			/* match a variable by its name */
-char	*nam;
+matchvar(			/* match a variable by its name */
+	const char	*nam
+)
 {
 	int	n = strlen(nam);
-	register int	i;
+	int	i;
 
 	for (i = 0; i < NVARS; i++)
 		if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n))
@@ -132,13 +138,14 @@ char	*nam;
 
 
 char *
-nvalue(vn, n)			/* return nth variable value */
-register int	vn;
-register int	n;
+nvalue(				/* return nth variable value */
+	int	vn,
+	int	n
+)
 {
-	register char	*cp;
+	char	*cp;
 
-	if (vval(vn) == NULL | n < 0 | n >= vdef(vn))
+	if ((vval(vn) == NULL) | (n < 0) | (n >= vdef(vn)))
 		return(NULL);
 	cp = vval(vn);
 	while (n--)
@@ -149,9 +156,9 @@ register int	n;
 
 
 void
-checkvalues()			/* check assignments */
+checkvalues(void)		/* check assignments */
 {
-	register int	i;
+	int	i;
 
 	for (i = 0; i < NVARS; i++)
 		if (vv[i].fixval != NULL)
@@ -160,8 +167,9 @@ checkvalues()			/* check assignments */
 
 
 void
-onevalue(vp)			/* only one assignment for this variable */
-register VARIABLE	*vp;
+onevalue(			/* only one assignment for this variable */
+	VARIABLE	*vp
+)
 {
 	if (vp->nass < 2)
 		return;
@@ -176,10 +184,11 @@ register VARIABLE	*vp;
 
 
 void
-catvalues(vp)			/* concatenate variable values */
-register VARIABLE	*vp;
+catvalues(			/* concatenate variable values */
+	VARIABLE	*vp
+)
 {
-	register char	*cp;
+	char	*cp;
 
 	if (vp->nass < 2)
 		return;
@@ -192,8 +201,10 @@ register VARIABLE	*vp;
 
 
 int
-badmatch(tv, cv)		/* case insensitive truncated comparison */
-register char	*tv, *cv;
+badmatch(			/* case insensitive truncated comparison */
+	char	*tv,
+	char	*cv
+)
 {
 	if (!*tv) return(1);		/* null string cannot match */
 	do
@@ -205,8 +216,9 @@ register char	*tv, *cv;
 
 
 void
-boolvalue(vp)			/* check boolean for legal values */
-register VARIABLE	*vp;
+boolvalue(			/* check boolean for legal values */
+	VARIABLE	*vp
+)
 {
 	if (!vp->nass) return;
 	onevalue(vp);
@@ -225,8 +237,9 @@ register VARIABLE	*vp;
 
 
 void
-qualvalue(vp)			/* check qualitative var. for legal values */
-register VARIABLE	*vp;
+qualvalue(			/* check qualitative var. for legal values */
+	VARIABLE	*vp
+)
 {
 	if (!vp->nass) return;
 	onevalue(vp);
@@ -248,8 +261,9 @@ register VARIABLE	*vp;
 
 
 void
-intvalue(vp)			/* check integer variable for legal values */
-register VARIABLE	*vp;
+intvalue(				/* check integer variable for legal values */
+	VARIABLE	*vp
+)
 {
 	if (!vp->nass) return;
 	onevalue(vp);
@@ -261,8 +275,9 @@ register VARIABLE	*vp;
 
 
 void
-fltvalue(vp)			/* check float variable for legal values */
-register VARIABLE	*vp;
+fltvalue(				/* check float variable for legal values */
+	VARIABLE	*vp
+)
 {
 	if (!vp->nass) return;
 	onevalue(vp);
@@ -274,11 +289,12 @@ register VARIABLE	*vp;
 
 
 void
-printvars(fp)			/* print variable values */
-register FILE	*fp;
+printvars(				/* print variable values */
+	FILE	*fp
+)
 {
 	int	i, j, k, clipline;
-	register char	*cp;
+	char	*cp;
 
 	for (i = 0; i < NVARS; i++)		/* print each variable */
 	    for (j = 0; j < vdef(i); j++) {	/* print each assignment */