--- ray/src/common/loadvars.c 1998/07/09 10:47:59 2.8
+++ ray/src/common/loadvars.c 2003/02/22 02:07:22 2.9
@@ -1,26 +1,78 @@
-/* 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.9 2003/02/22 02:07:22 greg Exp $";
#endif
-
/*
* Routines for loading and checking variables from file.
*/
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes Radiance software
+ * (http://radsite.lbl.gov/)
+ * developed by the Lawrence Berkeley National Laboratory
+ * (http://www.lbl.gov/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ * and "The Regents of the University of California" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ * nor may "Radiance" appear in their name, without prior written
+ * permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory. For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * .
+ */
+
#include
+#include
#include
#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;
{
@@ -97,9 +149,9 @@ VARIABLE *(*mv)();
while (*cp++)
;
i = cp - vp->value;
- vp->value = realloc(vp->value, i+n+1);
+ vp->value = (char *)realloc(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);
@@ -151,6 +203,7 @@ register int n;
}
+void
checkvalues() /* check assignments */
{
register int i;
@@ -161,6 +214,7 @@ checkvalues() /* check assignments */
}
+void
onevalue(vp) /* only one assignment for this variable */
register VARIABLE *vp;
{
@@ -176,6 +230,7 @@ register VARIABLE *vp;
}
+void
catvalues(vp) /* concatenate variable values */
register VARIABLE *vp;
{
@@ -204,6 +259,7 @@ register char *tv, *cv;
}
+void
boolvalue(vp) /* check boolean for legal values */
register VARIABLE *vp;
{
@@ -223,6 +279,7 @@ register VARIABLE *vp;
}
+void
qualvalue(vp) /* check qualitative var. for legal values */
register VARIABLE *vp;
{
@@ -245,6 +302,7 @@ register VARIABLE *vp;
}
+void
intvalue(vp) /* check integer variable for legal values */
register VARIABLE *vp;
{
@@ -257,6 +315,7 @@ register VARIABLE *vp;
}
+void
fltvalue(vp) /* check float variable for legal values */
register VARIABLE *vp;
{
@@ -269,6 +328,7 @@ register VARIABLE *vp;
}
+void
printvars(fp) /* print variable values */
register FILE *fp;
{