.. | .. |
---|
9 | 9 | #include <linux/errno.h> |
---|
10 | 10 | #include "symtab.h" |
---|
11 | 11 | |
---|
12 | | -static unsigned int symhash(struct hashtab *h, const void *key) |
---|
| 12 | +static unsigned int symhash(const void *key) |
---|
13 | 13 | { |
---|
14 | 14 | const char *p, *keyp; |
---|
15 | 15 | unsigned int size; |
---|
.. | .. |
---|
20 | 20 | size = strlen(keyp); |
---|
21 | 21 | for (p = keyp; (p - keyp) < size; p++) |
---|
22 | 22 | val = (val << 4 | (val >> (8*sizeof(unsigned int)-4))) ^ (*p); |
---|
23 | | - return val & (h->size - 1); |
---|
| 23 | + return val; |
---|
24 | 24 | } |
---|
25 | 25 | |
---|
26 | | -static int symcmp(struct hashtab *h, const void *key1, const void *key2) |
---|
| 26 | +static int symcmp(const void *key1, const void *key2) |
---|
27 | 27 | { |
---|
28 | 28 | const char *keyp1, *keyp2; |
---|
29 | 29 | |
---|
.. | .. |
---|
32 | 32 | return strcmp(keyp1, keyp2); |
---|
33 | 33 | } |
---|
34 | 34 | |
---|
| 35 | +static const struct hashtab_key_params symtab_key_params = { |
---|
| 36 | + .hash = symhash, |
---|
| 37 | + .cmp = symcmp, |
---|
| 38 | +}; |
---|
35 | 39 | |
---|
36 | 40 | int symtab_init(struct symtab *s, unsigned int size) |
---|
37 | 41 | { |
---|
38 | | - s->table = hashtab_create(symhash, symcmp, size); |
---|
39 | | - if (!s->table) |
---|
40 | | - return -ENOMEM; |
---|
41 | 42 | s->nprim = 0; |
---|
42 | | - return 0; |
---|
| 43 | + return hashtab_init(&s->table, size); |
---|
43 | 44 | } |
---|
44 | 45 | |
---|
| 46 | +int symtab_insert(struct symtab *s, char *name, void *datum) |
---|
| 47 | +{ |
---|
| 48 | + return hashtab_insert(&s->table, name, datum, symtab_key_params); |
---|
| 49 | +} |
---|
| 50 | + |
---|
| 51 | +void *symtab_search(struct symtab *s, const char *name) |
---|
| 52 | +{ |
---|
| 53 | + return hashtab_search(&s->table, name, symtab_key_params); |
---|
| 54 | +} |
---|