Kouhei Sutou
null+****@clear*****
Tue Jan 24 15:21:05 JST 2017
Kouhei Sutou 2017-01-24 15:21:05 +0900 (Tue, 24 Jan 2017) New Revision: 01700bd435d94f35632a00fdb554476ba3b1fa1e https://github.com/groonga/groonga/commit/01700bd435d94f35632a00fdb554476ba3b1fa1e Message: Reduce macro scope Modified files: lib/db.c Modified: lib/db.c (+2 -2) =================================================================== --- lib/db.c 2017-01-24 15:20:21 +0900 (5758f86) +++ lib/db.c 2017-01-24 15:21:05 +0900 (5ae53c0) @@ -5574,7 +5574,6 @@ grn_obj_get_accessor_rset_value(grn_ctx *ctx, grn_obj *obj, *rp = accessor_new(ctx); (*rp)->obj = obj; - switch (action) { #define CHECK_GROUP_CALC_FLAG(flag) do { \ if (GRN_TABLE_IS_GROUPED(obj)) { \ grn_table_group_flags flags; \ @@ -5586,6 +5585,7 @@ grn_obj_get_accessor_rset_value(grn_ctx *ctx, grn_obj *obj, } \ } \ } while(GRN_FALSE) + switch (action) { case GRN_ACCESSOR_GET_SCORE : if (DB_OBJ(obj)->header.flags & GRN_OBJ_WITH_SUBREC) { (*rp)->action = action; @@ -5613,6 +5613,7 @@ grn_obj_get_accessor_rset_value(grn_ctx *ctx, grn_obj *obj, } break; } +#undef CHECK_GROUP_CALC_FLAG switch (obj->header.type) { case GRN_TABLE_PAT_KEY : @@ -5633,7 +5634,6 @@ grn_obj_get_accessor_rset_value(grn_ctx *ctx, grn_obj *obj, if (!(obj = grn_ctx_at(ctx, obj->header.domain))) { goto exit; } -#undef CHECK_GROUP_CALC_FLAG } exit : -------------- next part -------------- HTML����������������������������...Download