Kouhei Sutou
null+****@clear*****
Tue Aug 18 23:16:11 JST 2015
Kouhei Sutou 2015-08-18 23:16:11 +0900 (Tue, 18 Aug 2015) New Revision: af62f412a632dbf9712dc65f7c942347344279e8 https://github.com/groonga/groonga/commit/af62f412a632dbf9712dc65f7c942347344279e8 Message: Stop to use continue/break in GRN_TINY_ARRAY_EACH Because they aren't supported in GRN_TINY_ARRAY_EACH. Modified files: lib/db.c Modified: lib/db.c (+12 -18) =================================================================== --- lib/db.c 2015-08-18 20:31:53 +0900 (c602a12) +++ lib/db.c 2015-08-18 23:16:11 +0900 (29bb7a8) @@ -12861,24 +12861,18 @@ grn_db_unmap(grn_ctx *ctx, grn_obj *db) GRN_TINY_ARRAY_EACH(&s->values, 1, grn_db_curr_id(ctx, db), id, vp, { grn_obj *obj = vp->ptr; - if (!obj) { - continue; - } - - switch (obj->header.type) { - case GRN_TABLE_HASH_KEY : - case GRN_TABLE_PAT_KEY : - case GRN_TABLE_DAT_KEY : - case GRN_TABLE_NO_KEY : - case GRN_COLUMN_FIX_SIZE : - case GRN_COLUMN_VAR_SIZE : - case GRN_COLUMN_INDEX : - grn_obj_close(ctx, obj); - break; - } - - if (ctx->rc != GRN_SUCCESS) { - break; + if (obj) { + switch (obj->header.type) { + case GRN_TABLE_HASH_KEY : + case GRN_TABLE_PAT_KEY : + case GRN_TABLE_DAT_KEY : + case GRN_TABLE_NO_KEY : + case GRN_COLUMN_FIX_SIZE : + case GRN_COLUMN_VAR_SIZE : + case GRN_COLUMN_INDEX : + grn_obj_close(ctx, obj); + break; + } } }); -------------- next part -------------- HTML����������������������������...Download