5 |
|
* Table lookup routines |
6 |
|
*/ |
7 |
|
|
8 |
– |
#include "copyright.h" |
9 |
– |
|
8 |
|
#include <stdio.h> |
9 |
|
#include <stdlib.h> |
10 |
|
#include <string.h> |
11 |
|
|
12 |
|
#include "lookup.h" |
13 |
|
|
16 |
– |
#ifdef NOSTRUCTASS |
17 |
– |
#define copystruct(d,s) memcpy((void *)(d),(void *)(s),sizeof(*(d))) |
18 |
– |
#else |
19 |
– |
#define copystruct(d,s) (*(d) = *(s)) |
20 |
– |
#endif |
14 |
|
|
22 |
– |
|
15 |
|
int |
16 |
< |
lu_init(tbl, nel) /* initialize tbl for at least nel elements */ |
17 |
< |
register LUTAB *tbl; |
18 |
< |
int nel; |
16 |
> |
lu_init( /* initialize tbl for at least nel elements */ |
17 |
> |
LUTAB *tbl, |
18 |
> |
int nel |
19 |
> |
) |
20 |
|
{ |
21 |
|
static int hsiztab[] = { |
22 |
|
31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381, |
23 |
|
32749, 65521, 131071, 262139, 524287, 1048573, 2097143, |
24 |
|
4194301, 8388593, 0 |
25 |
|
}; |
26 |
< |
register int *hsp; |
26 |
> |
int *hsp; |
27 |
|
|
28 |
|
nel += nel>>1; /* 66% occupancy */ |
29 |
|
for (hsp = hsiztab; *hsp; hsp++) |
40 |
|
|
41 |
|
|
42 |
|
unsigned long |
43 |
< |
lu_shash(s) /* hash a nul-terminated string */ |
44 |
< |
char *s; |
43 |
> |
lu_shash( /* hash a nul-terminated string */ |
44 |
> |
const char *s |
45 |
> |
) |
46 |
|
{ |
47 |
|
static unsigned char shuffle[256] = { |
48 |
|
0, 157, 58, 215, 116, 17, 174, 75, 232, 133, 34, |
70 |
|
106, 7, 164, 65, 222, 123, 24, 181, 82, 239, 140, |
71 |
|
41, 198, 99 |
72 |
|
}; |
73 |
< |
register int i = 0; |
74 |
< |
register unsigned long h = 0; |
75 |
< |
register unsigned char *t = (unsigned char *)s; |
73 |
> |
int i = 0; |
74 |
> |
unsigned long h = 0; |
75 |
> |
unsigned const char *t = (unsigned const char *)s; |
76 |
|
|
77 |
|
while (*t) |
78 |
|
h ^= (unsigned long)shuffle[*t++] << ((i+=11) & 0xf); |
82 |
|
|
83 |
|
|
84 |
|
LUENT * |
85 |
< |
lu_find(tbl, key) /* find a table entry */ |
86 |
< |
register LUTAB *tbl; |
87 |
< |
char *key; |
85 |
> |
lu_find( /* find a table entry */ |
86 |
> |
LUTAB *tbl, |
87 |
> |
const char *key |
88 |
> |
) |
89 |
|
{ |
90 |
|
unsigned long hval; |
91 |
|
int i, n; |
92 |
< |
register int ndx; |
93 |
< |
register LUENT *le; |
92 |
> |
int ndx; |
93 |
> |
LUENT *le; |
94 |
|
/* look up object */ |
95 |
|
if (tbl->tsiz == 0 && !lu_init(tbl, 1)) |
96 |
|
return(NULL); |
126 |
|
* recursive call to lu_find(). |
127 |
|
*/ |
128 |
|
while (ndx--) |
129 |
< |
if (le[ndx].key != NULL) |
129 |
> |
if (le[ndx].key != NULL) { |
130 |
|
if (le[ndx].data != NULL) |
131 |
< |
copystruct(lu_find(tbl,le[ndx].key), &le[ndx]); |
131 |
> |
*lu_find(tbl,le[ndx].key) = le[ndx]; |
132 |
|
else if (tbl->freek != NULL) |
133 |
|
(*tbl->freek)(le[ndx].key); |
134 |
+ |
} |
135 |
|
free((void *)le); |
136 |
|
goto tryagain; /* should happen only once! */ |
137 |
|
} |
138 |
|
|
139 |
|
|
140 |
|
void |
141 |
< |
lu_delete(tbl, key) /* delete a table entry */ |
142 |
< |
register LUTAB *tbl; |
143 |
< |
char *key; |
141 |
> |
lu_delete( /* delete a table entry */ |
142 |
> |
LUTAB *tbl, |
143 |
> |
const char *key |
144 |
> |
) |
145 |
|
{ |
146 |
< |
register LUENT *le; |
146 |
> |
LUENT *le; |
147 |
|
|
148 |
|
if ((le = lu_find(tbl, key)) == NULL) |
149 |
|
return; |
157 |
|
|
158 |
|
|
159 |
|
int |
160 |
< |
lu_doall(tbl, f) /* loop through all valid table entries */ |
161 |
< |
register LUTAB *tbl; |
162 |
< |
int (*f)(); |
160 |
> |
lu_doall( /* loop through all valid table entries */ |
161 |
> |
const LUTAB *tbl, |
162 |
> |
/* int (*f)(const LUENT *, void *) */ |
163 |
> |
lut_doallf_t *f, |
164 |
> |
void *p |
165 |
> |
) |
166 |
|
{ |
167 |
|
int rval = 0; |
168 |
< |
register LUENT *tp; |
168 |
> |
const LUENT *tp; |
169 |
|
|
170 |
|
for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; ) |
171 |
< |
if (tp->data != NULL) |
172 |
< |
if (f != NULL) |
173 |
< |
rval += (*f)(tp); |
174 |
< |
else |
171 |
> |
if (tp->data != NULL) { |
172 |
> |
if (f != NULL) { |
173 |
> |
int r = (*f)(tp, p); |
174 |
> |
if (r < 0) |
175 |
> |
return(-1); |
176 |
> |
rval += r; |
177 |
> |
} else |
178 |
|
rval++; |
179 |
+ |
} |
180 |
|
return(rval); |
181 |
|
} |
182 |
|
|
183 |
|
|
184 |
|
void |
185 |
< |
lu_done(tbl) /* free table and contents */ |
186 |
< |
register LUTAB *tbl; |
185 |
> |
lu_done( /* free table and contents */ |
186 |
> |
LUTAB *tbl |
187 |
> |
) |
188 |
|
{ |
189 |
< |
register LUENT *tp; |
189 |
> |
LUENT *tp; |
190 |
|
|
191 |
|
if (!tbl->tsiz) |
192 |
|
return; |