--- ray/src/common/calfunc.c 2003/02/22 02:07:21 2.8
+++ ray/src/common/calfunc.c 2003/07/17 09:21:29 2.12
@@ -1,5 +1,5 @@
#ifndef lint
-static const char RCSid[] = "$Id: calfunc.c,v 2.8 2003/02/22 02:07:21 greg Exp $";
+static const char RCSid[] = "$Id: calfunc.c,v 2.12 2003/07/17 09:21:29 schorsch Exp $";
#endif
/*
* calfunc.c - routines for calcomp using functions.
@@ -10,69 +10,14 @@ static const char RCSid[] = "$Id: calfunc.c,v 2.8 2003
* 2/19/03 Eliminated conditional compiles in favor of esupport extern.
*/
-/* ====================================================================
- * 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 "copyright.h"
#include
-
+#include
#include
-
#include
+#include "rterror.h"
#include "calcomp.h"
/* bits in argument flag (better be right!) */
@@ -89,7 +34,7 @@ typedef struct activation {
static ACTIVATION *curact = NULL;
-static double libfunc();
+static double libfunc(char *fname, VARDEF *vp);
#ifndef MAXLIB
#define MAXLIB 64 /* maximum number of library functions */
@@ -310,6 +255,7 @@ badarg:
eputs(actp->name);
eputs(": argument not a function\n");
quit(1);
+ return NULL; /* pro forma return */
}
@@ -405,7 +351,7 @@ VARDEF *vp;
else if (isinf(d))
errno = ERANGE;
#endif
- if (errno) {
+ if (errno == EDOM || errno == ERANGE) {
wputs(fname);
if (errno == EDOM)
wputs(": domain error\n");
@@ -441,7 +387,7 @@ l_select() /* return argument #(A1+1) */
{
register int n;
- n = argument(1) + .5;
+ n = (int)(argument(1) + .5);
if (n == 0)
return(nargum()-1);
if (n < 1 || n > nargum()-1) {