--- ray/src/common/savestr.c 2003/02/22 02:07:22 2.5
+++ ray/src/common/savestr.c 2004/03/04 16:34:34 2.10
@@ -1,5 +1,5 @@
#ifndef lint
-static const char RCSid[] = "$Id: savestr.c,v 2.5 2003/02/22 02:07:22 greg Exp $";
+static const char RCSid[] = "$Id: savestr.c,v 2.10 2004/03/04 16:34:34 greg Exp $";
#endif
/*
* savestr.c - routines for efficient string storage.
@@ -18,65 +18,17 @@ static const char RCSid[] = "$Id: savestr.c,v 2.5 2003
* External symbols declared in standard.h
*/
-/* ====================================================================
- * 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 "rtmisc.h"
+#include "rterror.h"
+#include "rtio.h"
+
#ifndef NHASH
-#define NHASH 509 /* hash table size (prime!) */
+#define NHASH 2039 /* hash table size (prime!) */
#endif
typedef struct s_head {
@@ -88,10 +40,6 @@ static S_HEAD *stab[NHASH];
#define hash(s) (shash(s)%NHASH)
-extern char *savestr(), *strcpy(), *malloc();
-
-#define NULL 0
-
#define string(sp) ((char *)((sp)+1))
#define salloc(str) (S_HEAD *)malloc(sizeof(S_HEAD)+1+strlen(str))
@@ -100,8 +48,7 @@ extern char *savestr(), *strcpy(), *malloc();
char *
-savestr(str) /* save a string */
-char *str;
+savestr(char *str) /* save a string */
{
register int hval;
register S_HEAD *sp;
@@ -127,8 +74,7 @@ char *str;
void
-freestr(s) /* free a string */
-char *s;
+freestr(char *s) /* free a string */
{
int hval;
register S_HEAD *spl, *sp;
@@ -151,8 +97,7 @@ char *s;
int
-shash(s)
-register char *s;
+shash(register char *s)
{
register int h = 0;