From 602e093504dc07fec421df636d307654685892cb Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Wed, 23 Dec 2009 11:48:49 -0800 Subject: Core compiles, though with warnings, and is still incomplete. --- src/upb_table.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/upb_table.c') diff --git a/src/upb_table.c b/src/upb_table.c index e73c6f4..41252a2 100644 --- a/src/upb_table.c +++ b/src/upb_table.c @@ -50,19 +50,19 @@ void upb_inttable_free(struct upb_inttable *t) { upb_table_free(&t->t); } void upb_strtable_free(struct upb_strtable *t) { // Free refs from the strtable. struct upb_strtable_entry *e = upb_strtable_begin(t); - for(; e; e = upb_strtable_next(&m->ntof, e)) { + for(; e; e = upb_strtable_next(t, e)) { upb_string_unref(e->key); } upb_table_free(&t->t); } -static uint32_t strtable_bucket(struct upb_strtable *t, struct upb_string *key) +static uint32_t strtable_bucket(struct upb_strtable *t, upb_string *key) { - uint32_t hash = MurmurHash2(key->ptr, key->byte_len, 0); + uint32_t hash = MurmurHash2(upb_string_getrobuf(key), upb_strlen(key), 0); return (hash & (upb_strtable_size(t)-1)) + 1; } -void *upb_strtable_lookup(struct upb_strtable *t, struct upb_string *key) +void *upb_strtable_lookup(struct upb_strtable *t, upb_string *key) { uint32_t bucket = strtable_bucket(t, key); struct upb_strtable_entry *e; -- cgit v1.2.3