Kouhei Sutou
null+****@clear*****
Sun Aug 10 12:08:34 JST 2014
Kouhei Sutou 2014-08-10 12:08:34 +0900 (Sun, 10 Aug 2014) New Revision: 5a7ac165e4c2302ec2071c3f2f09b57c0e0a35e9 https://github.com/groonga/groonga/commit/5a7ac165e4c2302ec2071c3f2f09b57c0e0a35e9 Message: Remove needless "got_" prefix It is keyword set. So "keyword" is enough. Modified files: lib/expr.c lib/expr.h Modified: lib/expr.c (+2 -2) =================================================================== --- lib/expr.c 2014-08-10 12:07:43 +0900 (afeb6a0) +++ lib/expr.c 2014-08-10 12:08:34 +0900 (be0cd3c) @@ -6818,7 +6818,7 @@ grn_expr_parser_close(grn_ctx *ctx) } grn_rc -grn_expr_get_keywords(grn_ctx *ctx, grn_obj *expr, grn_obj *got_keywords) +grn_expr_get_keywords(grn_ctx *ctx, grn_obj *expr, grn_obj *keywords) { int i, n; scan_info **sis, *si; @@ -6839,7 +6839,7 @@ grn_expr_get_keywords(grn_ctx *ctx, grn_obj *expr, grn_obj *got_keywords) } else { if (si->op == GRN_OP_MATCH && si->query) { if (butp == (si->logical_op == GRN_OP_AND_NOT)) { - GRN_PTR_PUT(ctx, got_keywords, si->query); + GRN_PTR_PUT(ctx, keywords, si->query); } } if (si->flags & SCAN_PUSH) { Modified: lib/expr.h (+1 -1) =================================================================== --- lib/expr.h 2014-08-10 12:07:43 +0900 (ab5ec6b) +++ lib/expr.h 2014-08-10 12:08:34 +0900 (f4aea97) @@ -59,7 +59,7 @@ grn_bool grn_scan_info_push_arg(scan_info *si, grn_obj *arg); grn_obj *grn_scan_info_get_arg(grn_ctx *ctx, scan_info *si, int i); int32_t grn_expr_code_get_weight(grn_ctx *ctx, grn_expr_code *ec); -grn_rc grn_expr_get_keywords(grn_ctx *ctx, grn_obj *expr, grn_obj *got_keywords); +grn_rc grn_expr_get_keywords(grn_ctx *ctx, grn_obj *expr, grn_obj *keywords); #ifdef __cplusplus } -------------- next part -------------- HTML����������������������������...Download