Kouhei Sutou
null+****@clear*****
Fri Jun 14 15:37:51 JST 2013
Kouhei Sutou 2013-06-14 15:37:51 +0900 (Fri, 14 Jun 2013) New Revision: 228907caa0357b02da81323557b3d666bc25c58a https://github.com/groonga/groonga/commit/228907caa0357b02da81323557b3d666bc25c58a Message: Revert "gcc: suppress a warning" This reverts commit 0e4bc056a1aa2db5e2a2e6dcb2dfadd469af04b0. We should not remove grn_XXX_get_value() call! Modified files: lib/db.c Modified: lib/db.c (+13 -0) =================================================================== --- lib/db.c 2013-06-14 15:09:08 +0900 (9495c63) +++ lib/db.c 2013-06-14 15:37:51 +0900 (e1229ad) @@ -5532,6 +5532,7 @@ grn_obj_get_value_(grn_ctx *ctx, grn_obj *obj, grn_id id, uint32_t *size) grn_obj * grn_obj_get_value(grn_ctx *ctx, grn_obj *obj, grn_id id, grn_obj *value) { + unsigned int len = 0; GRN_API_ENTER; if (!id) { goto exit; } if (!obj) { @@ -5572,6 +5573,10 @@ grn_obj_get_value(grn_ctx *ctx, grn_obj *obj, grn_id id, grn_obj *value) MERR("grn_bulk_space failed"); goto exit; } + { + char *curr = GRN_BULK_CURR(value); + len = grn_pat_get_value(ctx, pat, id, curr - size); + } value->header.type = GRN_BULK; value->header.domain = grn_obj_get_range(ctx, obj); } @@ -5588,6 +5593,10 @@ grn_obj_get_value(grn_ctx *ctx, grn_obj *obj, grn_id id, grn_obj *value) MERR("grn_bulk_space failed"); goto exit; } + { + char *curr = GRN_BULK_CURR(value); + len = grn_hash_get_value(ctx, hash, id, curr - size); + } value->header.type = GRN_BULK; value->header.domain = grn_obj_get_range(ctx, obj); } @@ -5601,6 +5610,10 @@ grn_obj_get_value(grn_ctx *ctx, grn_obj *obj, grn_id id, grn_obj *value) MERR("grn_bulk_space failed"); goto exit; } + { + char *curr = GRN_BULK_CURR(value); + len = grn_array_get_value(ctx, array, id, curr - size); + } value->header.type = GRN_BULK; value->header.domain = grn_obj_get_range(ctx, obj); } -------------- next part -------------- HTML����������������������������...Download