Navigation Menu

Skip to content

Commit

Permalink
Revert "gcc: suppress a warning"
Browse files Browse the repository at this point in the history
This reverts commit 0e4bc05.

We should not remove grn_XXX_get_value() call!
  • Loading branch information
kou committed Jun 14, 2013
1 parent 02ebf85 commit 228907c
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions lib/db.c
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down

0 comments on commit 228907c

Please sign in to comment.