ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/savestr.c
(Generate patch)

Comparing ray/src/common/savestr.c (file contents):
Revision 2.2 by greg, Fri Jul 3 10:51:50 1992 UTC vs.
Revision 2.6 by greg, Tue Feb 25 02:47: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 + #include "copyright.h"
22 +
23   #ifndef  NHASH
24   #define  NHASH          509             /* hash table size (prime!) */
25   #endif
# Line 33 | Line 31 | typedef struct s_head {
31  
32   static S_HEAD  *stab[NHASH];
33  
34 < static int  shash();
34 > #define  hash(s)        (shash(s)%NHASH)
35  
36   extern char  *savestr(), *strcpy(), *malloc();
37  
# Line 43 | Line 41 | extern char  *savestr(), *strcpy(), *malloc();
41  
42   #define  salloc(str)    (S_HEAD *)malloc(sizeof(S_HEAD)+1+strlen(str))
43  
44 < #define  sfree(sp)      free((char *)(sp))
44 > #define  sfree(sp)      free((void *)(sp))
45  
46  
47   char *
# Line 55 | Line 53 | char  *str;
53  
54          if (str == NULL)
55                  return(NULL);
56 <        hval = shash(str);
56 >        hval = hash(str);
57          for (sp = stab[hval]; sp != NULL; sp = sp->next)
58                  if (!strcmp(str, string(sp))) {
59                          sp->nl++;
# Line 73 | Line 71 | char  *str;
71   }
72  
73  
74 + void
75   freestr(s)                              /* free a string */
76   char  *s;
77   {
# Line 81 | Line 80 | char  *s;
80  
81          if (s == NULL)
82                  return;
83 <        hval = shash(s);
83 >        hval = hash(s);
84          for (spl = NULL, sp = stab[hval]; sp != NULL; spl = sp, sp = sp->next)
85                  if (s == string(sp)) {
86                          if (--sp->nl > 0)
# Line 96 | Line 95 | char  *s;
95   }
96  
97  
98 < static int
99 < shash(s)                                /* hash a string */
98 > int
99 > shash(s)
100   register char  *s;
101   {
102          register int  h = 0;
103  
104          while (*s)
105 <                h += *s++;
106 <
108 <        return(h % NHASH);
105 >                h = (h<<1 & 0x7fff) ^ (*s++ & 0xff);
106 >        return(h);
107   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines