--- ray/src/rt/m_mist.c	2003/02/22 02:07:28	2.10
+++ ray/src/rt/m_mist.c	2004/09/28 17:54:19	2.16
@@ -1,70 +1,17 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: m_mist.c,v 2.10 2003/02/22 02:07:28 greg Exp $";
+static const char RCSid[] = "$Id: m_mist.c,v 2.16 2004/09/28 17:54:19 greg Exp $";
 #endif
 /*
  * Mist volumetric material.
  */
 
-/* ====================================================================
- * 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
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
-#include  "ray.h"
+#include <string.h>
 
+#include  "ray.h"
 #include  "source.h"
+#include  "rtotypes.h"
 
 /*
  *  A mist volume is used to specify a region in the scene where a certain
@@ -104,11 +51,16 @@ static const char	RCSid[] = "$Id: m_mist.c,v 2.10 2003
 
 #define RELAYDELIM	'>'		/* relay delimiter character */
 
+static int inslist(int  *sl, int  n);
+static int srcmatch(SRCREC  *sp, char  *id);
+static void add2slist(RAY  *r, int  *sl);
 
+
 static int
-inslist(sl, n)		/* return index of source n if it's in list sl */
-register int  *sl;
-register int  n;
+inslist(		/* return index of source n if it's in list sl */
+	register int  *sl,
+	register int  n
+)
 {
 	register int  i;
 
@@ -120,14 +72,14 @@ register int  n;
 
 
 static int
-srcmatch(sp, id)	/* check for an id match on a light source */
-register SRCREC  *sp;
-register char  *id;
+srcmatch(	/* check for an id match on a light source */
+	register SRCREC  *sp,
+	register char  *id
+)
 {
-	extern char  *index();
 	register char  *cp;
 						/* check for relay sources */
-	while ((cp = index(id, RELAYDELIM)) != NULL) {
+	while ((cp = strchr(id, RELAYDELIM)) != NULL) {
 		if (!(sp->sflags & SVIRTUAL) || sp->so == NULL)
 			return(0);
 		if (strncmp(id, sp->so->oname, cp-id) || sp->so->oname[cp-id])
@@ -142,9 +94,10 @@ register char  *id;
 
 
 static void
-add2slist(r, sl)	/* add source list to ray's */
-register RAY  *r;
-register int  *sl;
+add2slist(	/* add source list to ray's */
+	register RAY  *r,
+	register int  *sl
+)
 {
 	static int  slspare[MAXSLIST+1];	/* in case of emergence */
 	register int  i;
@@ -163,10 +116,11 @@ register int  *sl;
 }
 
 
-int
-m_mist(m, r)		/* process a ray entering or leaving some mist */
-OBJREC  *m;
-register RAY  *r;
+extern int
+m_mist(		/* process a ray entering or leaving some mist */
+	OBJREC  *m,
+	register RAY  *r
+)
 {
 	RAY  p;
 	int  *myslist = NULL;
@@ -231,7 +185,7 @@ register RAY  *r;
 	} else {				/* leaving ray */
 		if (myslist != NULL) {			/* delete from list */
 			for (j = myslist[0]; j > 0; j--)
-				if (i = inslist(p.slights, myslist[j]))
+				if ( (i = inslist(p.slights, myslist[j])) )
 					p.slights[i] = -1;
 			for (i = 0, j = 1; j <= p.slights[0]; j++)
 				if (p.slights[j] != -1)
@@ -268,4 +222,5 @@ register RAY  *r;
 	return(1);
 memerr:
 	error(SYSTEM, "out of memory in m_mist");
+	return 0; /* pro forma return */
 }