null+****@clear*****
null+****@clear*****
2012年 4月 3日 (火) 18:14:14 JST
Susumu Yata 2012-04-03 18:14:14 +0900 (Tue, 03 Apr 2012)
New Revision: 286c0659f43580f1278e375d0c6bc4d2123621d2
Log:
Use grn_tiny_hash_entry in grn_tiny_hash_fin().
Modified files:
lib/hash.c
Modified: lib/hash.c (+5 -4)
===================================================================
--- lib/hash.c 2012-04-03 18:10:33 +0900 (774510f)
+++ lib/hash.c 2012-04-03 18:14:14 +0900 (192d350)
@@ -1507,11 +1507,12 @@ grn_tiny_hash_fin(grn_ctx *ctx, grn_hash *hash)
for (hash_ptr = hash->index; num_remaining_entries; hash_ptr++) {
const grn_id id = *hash_ptr;
if (id && id != GARBAGE) {
- entry_astr * const e = grn_tiny_array_at_inline(&hash->a, id);
- GRN_ASSERT(e);
+ grn_tiny_hash_entry * const entry =
+ (grn_tiny_hash_entry *)grn_tiny_array_at_inline(&hash->a, id);
+ GRN_ASSERT(entry);
num_remaining_entries--;
- if (e && !(e->flag & HASH_IMMEDIATE)) {
- GRN_CTX_FREE(ctx, e->str);
+ if (entry && !(entry->flag & HASH_IMMEDIATE)) {
+ GRN_CTX_FREE(ctx, entry->key.ptr);
}
}
}