--- ray/src/common/loadvars.c	1998/06/04 13:29:27	2.7
+++ ray/src/common/loadvars.c	2003/07/30 10:11:06	2.14
@@ -1,26 +1,25 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: loadvars.c,v 2.14 2003/07/30 10:11:06 schorsch Exp $";
 #endif
-
 /*
  *  Routines for loading and checking variables from file.
  */
 
+#include "copyright.h"
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
+
+#include "standard.h"
 #include "vars.h"
 
 #define NOCHAR	127		/* constant for character to delete */
 
-#ifndef malloc
-extern char  *malloc(), *realloc();
-#endif
-
 extern char  *fgetline();
 
 
+void
 loadvars(rfname)		/* load variables into vv from file */
 char	*rfname;
 {
@@ -61,7 +60,7 @@ char	*rfname;
 int
 setvariable(ass, mv)		/* assign variable according to string */
 register char	*ass;
-VARIABLE	*(*mv)();
+VARIABLE	*(*mv)(char*);
 {
 	char	varname[32];
 	int	n;
@@ -91,15 +90,15 @@ 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 = realloc(vp->value, i+n+1);
+		vp->value = (char *)realloc((void *)vp->value, i+n+1);
 	} else
-		vp->value = malloc(n+1);
+		vp->value = (char *)malloc(n+1);
 	if (vp->value == NULL) {
 		perror(progname);
 		quit(1);
@@ -141,7 +140,7 @@ register int	n;
 {
 	register 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--)
@@ -151,6 +150,7 @@ register int	n;
 }
 
 
+void
 checkvalues()			/* check assignments */
 {
 	register int	i;
@@ -161,6 +161,7 @@ checkvalues()			/* check assignments */
 }
 
 
+void
 onevalue(vp)			/* only one assignment for this variable */
 register VARIABLE	*vp;
 {
@@ -176,6 +177,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 catvalues(vp)			/* concatenate variable values */
 register VARIABLE	*vp;
 {
@@ -204,6 +206,7 @@ register char	*tv, *cv;
 }
 
 
+void
 boolvalue(vp)			/* check boolean for legal values */
 register VARIABLE	*vp;
 {
@@ -223,6 +226,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 qualvalue(vp)			/* check qualitative var. for legal values */
 register VARIABLE	*vp;
 {
@@ -245,6 +249,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 intvalue(vp)			/* check integer variable for legal values */
 register VARIABLE	*vp;
 {
@@ -257,6 +262,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 fltvalue(vp)			/* check float variable for legal values */
 register VARIABLE	*vp;
 {
@@ -269,6 +275,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 printvars(fp)			/* print variable values */
 register FILE	*fp;
 {
@@ -279,7 +286,7 @@ register FILE	*fp;
 	    for (j = 0; j < vdef(i); j++) {	/* print each assignment */
 		fputs(vnam(i), fp);
 		fputs("= ", fp);
-		k = clipline = ( vv[i].fixval == catvalues ? 64 : 120 )
+		k = clipline = ( vv[i].fixval == catvalues ? 64 : 236 )
 				- strlen(vnam(i)) ;
 		cp = nvalue(i, j);
 		while (*cp) {