ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/savestr.c

Comparing ray/src/common/savestr.c (file contents):
Revision 1.2 by greg, Thu Feb 2 13:53:43 1989 UTC vs.
Revision 2.5 by greg, Sat Feb 22 02:07:22 2003 UTC

#	Line 1 | Line 1
1	–	/* Copyright 1988 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  savestr.c - routines for efficient string storage.
6		*
#	Line 12 | Line 9 | static char SCCSid[] = "$SunId$ LBL";
9		*      All strings must be null-terminated.  There is
10		*  no imposed length limit.
11		*      Strings stored with savestr(s) can be equated
12	<	*  reliably using their pointer values.  A tailored version
16	<	*  of strcmp(s1,s2) is included.
12	>	*  reliably using their pointer values.
13		*      Calls to savestr(s) and freestr(s) should be
14		*  balanced (obviously).  The last call to freestr(s)
15		*  frees memory associated with the string; it should
16		*  never be referenced again.
17		*
18	<	*     5/14/87
18	>	*  External symbols declared in standard.h
19		*/
20
21	+	/* ====================================================================
22	+	* The Radiance Software License, Version 1.0
23	+	*
24	+	* Copyright (c) 1990 - 2002 The Regents of the University of California,
25	+	* through Lawrence Berkeley National Laboratory.   All rights reserved.
26	+	*
27	+	* Redistribution and use in source and binary forms, with or without
28	+	* modification, are permitted provided that the following conditions
29	+	* are met:
30	+	*
31	+	* 1. Redistributions of source code must retain the above copyright
32	+	*         notice, this list of conditions and the following disclaimer.
33	+	*
34	+	* 2. Redistributions in binary form must reproduce the above copyright
35	+	*       notice, this list of conditions and the following disclaimer in
36	+	*       the documentation and/or other materials provided with the
37	+	*       distribution.
38	+	*
39	+	* 3. The end-user documentation included with the redistribution,
40	+	*           if any, must include the following acknowledgment:
41	+	*             "This product includes Radiance software
42	+	*                 (http://radsite.lbl.gov/)
43	+	*                 developed by the Lawrence Berkeley National Laboratory
44	+	*               (http://www.lbl.gov/)."
45	+	*       Alternately, this acknowledgment may appear in the software itself,
46	+	*       if and wherever such third-party acknowledgments normally appear.
47	+	*
48	+	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
49	+	*       and "The Regents of the University of California" must
50	+	*       not be used to endorse or promote products derived from this
51	+	*       software without prior written permission. For written
52	+	*       permission, please contact [email protected].
53	+	*
54	+	* 5. Products derived from this software may not be called "Radiance",
55	+	*       nor may "Radiance" appear in their name, without prior written
56	+	*       permission of Lawrence Berkeley National Laboratory.
57	+	*
58	+	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
59	+	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
60	+	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
61	+	* DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
62	+	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
63	+	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
64	+	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
65	+	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
66	+	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
67	+	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
68	+	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
69	+	* SUCH DAMAGE.
70	+	* ====================================================================
71	+	*
72	+	* This software consists of voluntary contributions made by many
73	+	* individuals on behalf of Lawrence Berkeley National Laboratory.   For more
74	+	* information on Lawrence Berkeley National Laboratory, please see
75	+	* <http://www.lbl.gov/>.
76	+	*/
77	+
78		#ifndef  NHASH
79		#define  NHASH          509             /* hash table size (prime!) */
80		#endif
#	Line 33 | Line 86 | typedef struct s_head {
86
87		static S_HEAD  *stab[NHASH];
88
89	+	#define  hash(s)        (shash(s)%NHASH)
90	+
91		extern char  *savestr(), *strcpy(), *malloc();
92
93		#define  NULL           0
#	Line 41 | Line 96 | extern char  *savestr(), *strcpy(), *malloc();
96
97		#define  salloc(str)    (S_HEAD *)malloc(sizeof(S_HEAD)+1+strlen(str))
98
99	<	#define  sfree(sp)      free((char *)(sp))
99	>	#define  sfree(sp)      free((void *)(sp))
100
101
102		char *
#	Line 53 | Line 108 | char  *str;
108
109		if (str == NULL)
110		return(NULL);
111	<	hval = shash(str);
111	>	hval = hash(str);
112		for (sp = stab[hval]; sp != NULL; sp = sp->next)
113		if (!strcmp(str, string(sp))) {
114		sp->nl++;
#	Line 71 | Line 126 | char  *str;
126		}
127
128
129	+	void
130		freestr(s)                              /* free a string */
131		char  *s;
132		{
#	Line 79 | Line 135 | char  *s;
135
136		if (s == NULL)
137		return;
138	<	hval = shash(s);
138	>	hval = hash(s);
139		for (spl = NULL, sp = stab[hval]; sp != NULL; spl = sp, sp = sp->next)
140		if (s == string(sp)) {
141		if (--sp->nl > 0)
#	Line 95 | Line 151 | char  *s;
151
152
153		int
154	<	strcmp(s1, s2)                          /* check for s1==s2 */
99	<	register char  *s1, *s2;
100	<	{
101	<	if (s1 == s2)
102	<	return(0);
103	<
104	<	while (*s1 == *s2++)
105	<	if (!*s1++)
106	<	return(0);
107	<
108	<	return(*s1 - *--s2);
109	<	}
110	<
111	<
112	<	static int
113	<	shash(s)                                /* hash a string */
154	>	shash(s)
155		register char  *s;
156		{
157		register int  h = 0;
158
159		while (*s)
160	<	h += *s++;
161	<
121	<	return(h % NHASH);
160	>	h = (h<<1 & 0x7fff) ^ (*s++ & 0xff);
161	>	return(h);
162		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)