Kouhei Sutou
null+****@clear*****
Tue May 10 13:37:42 JST 2016
Kouhei Sutou 2016-05-10 13:37:42 +0900 (Tue, 10 May 2016) New Revision: 89ec80f575f1eb828fc556748e2041a9f2b86879 https://github.com/groonga/groonga/commit/89ec80f575f1eb828fc556748e2041a9f2b86879 Message: Remove unused argument Modified files: lib/db.c lib/grn_db.h lib/proc.c Modified: lib/db.c (+8 -15) =================================================================== --- lib/db.c 2016-05-10 13:34:57 +0900 (073a53b) +++ lib/db.c 2016-05-10 13:37:42 +0900 (4a3ffe1) @@ -3006,8 +3006,7 @@ grn_table_next(grn_ctx *ctx, grn_obj *table, grn_id id) static grn_rc grn_accessor_resolve_one_index_column(grn_ctx *ctx, grn_accessor *accessor, - grn_obj *current_res, grn_obj **next_res, - grn_search_optarg *optarg) + grn_obj *current_res, grn_obj **next_res) { grn_rc rc = GRN_SUCCESS; grn_obj *column = NULL; @@ -3110,8 +3109,7 @@ grn_accessor_resolve_one_index_column(grn_ctx *ctx, grn_accessor *accessor, static grn_rc grn_accessor_resolve_one_table(grn_ctx *ctx, grn_accessor *accessor, - grn_obj *current_res, grn_obj **next_res, - grn_search_optarg *optarg) + grn_obj *current_res, grn_obj **next_res) { grn_rc rc = GRN_SUCCESS; grn_obj *table; @@ -3165,8 +3163,7 @@ grn_accessor_resolve_one_table(grn_ctx *ctx, grn_accessor *accessor, static grn_rc grn_accessor_resolve_one_data_column(grn_ctx *ctx, grn_accessor *accessor, - grn_obj *current_res, grn_obj **next_res, - grn_search_optarg *optarg) + grn_obj *current_res, grn_obj **next_res) { grn_rc rc = GRN_SUCCESS; grn_obj *index = NULL; @@ -3236,8 +3233,7 @@ grn_accessor_resolve_one_data_column(grn_ctx *ctx, grn_accessor *accessor, grn_rc grn_accessor_resolve(grn_ctx *ctx, grn_obj *accessor, int deep, - grn_obj *base_res, grn_obj **res, - grn_search_optarg *optarg) + grn_obj *base_res, grn_obj **res) { grn_rc rc = GRN_SUCCESS; grn_accessor *a; @@ -3261,16 +3257,13 @@ grn_accessor_resolve(grn_ctx *ctx, grn_obj *accessor, int deep, a = (grn_accessor *)GRN_PTR_VALUE_AT(&accessor_stack, i - 1); if (a->obj->header.type == GRN_COLUMN_INDEX) { rc = grn_accessor_resolve_one_index_column(ctx, a, - current_res, &next_res, - optarg); + current_res, &next_res); } else if (grn_obj_is_table(ctx, a->obj)) { rc = grn_accessor_resolve_one_table(ctx, a, - current_res, &next_res, - optarg); + current_res, &next_res); } else { rc = grn_accessor_resolve_one_data_column(ctx, a, - current_res, &next_res, - optarg); + current_res, &next_res); } if (current_res != base_res) { @@ -3357,7 +3350,7 @@ grn_obj_search_accessor(grn_ctx *ctx, grn_obj *obj, grn_obj *query, goto exit; } rc = grn_accessor_resolve(ctx, obj, n_accessors - 1, base_res, - &resolve_res, optarg); + &resolve_res); if (resolve_res) { grn_id *record_id; grn_rset_recinfo *recinfo; Modified: lib/grn_db.h (+1 -2) =================================================================== --- lib/grn_db.h 2016-05-10 13:34:57 +0900 (75c0431) +++ lib/grn_db.h 2016-05-10 13:37:42 +0900 (f34023a) @@ -433,8 +433,7 @@ GRN_API grn_rc grn_column_filter(grn_ctx *ctx, grn_obj *column, grn_operator set_op); grn_rc grn_accessor_resolve(grn_ctx *ctx, grn_obj *accessor, int deep, - grn_obj *base_res, grn_obj **res, - grn_search_optarg *optarg); + grn_obj *base_res, grn_obj **res); typedef struct { grn_id target; Modified: lib/proc.c (+2 -2) =================================================================== --- lib/proc.c 2016-05-10 13:34:57 +0900 (2bf67a0) +++ lib/proc.c 2016-05-10 13:37:42 +0900 (7978f6e) @@ -2616,7 +2616,7 @@ run_sub_filter(grn_ctx *ctx, grn_obj *table, scope_domain, NULL); grn_table_select(ctx, scope_domain, sub_filter, base_res, GRN_OP_OR); if (scope->header.type == GRN_ACCESSOR) { - rc = grn_accessor_resolve(ctx, scope, -1, base_res, &resolve_res, NULL); + rc = grn_accessor_resolve(ctx, scope, -1, base_res, &resolve_res); } else { grn_accessor accessor; accessor.header.type = GRN_ACCESSOR; @@ -2624,7 +2624,7 @@ run_sub_filter(grn_ctx *ctx, grn_obj *table, accessor.action = GRN_ACCESSOR_GET_COLUMN_VALUE; accessor.next = NULL; rc = grn_accessor_resolve(ctx, (grn_obj *)&accessor, -1, base_res, - &resolve_res, NULL); + &resolve_res); } if (resolve_res) { rc = grn_table_setoperation(ctx, res, resolve_res, res, op); -------------- next part -------------- HTML����������������������������...下载
