naoa
null+****@clear*****
Sun Feb 21 18:26:39 JST 2016
naoa 2016-02-21 18:26:39 +0900 (Sun, 21 Feb 2016) New Revision: c0d05ac401fd0dc1b7a5fed14da8e00960060b61 https://github.com/groonga/groonga/commit/c0d05ac401fd0dc1b7a5fed14da8e00960060b61 Merged a369942: Merge pull request #488 from naoa/fuzzy-search-fix Message: Use suitable name Modified files: lib/proc/proc_fuzzy_search.c Modified: lib/proc/proc_fuzzy_search.c (+7 -7) =================================================================== --- lib/proc/proc_fuzzy_search.c 2016-02-21 18:22:08 +0900 (4c2e1f6) +++ lib/proc/proc_fuzzy_search.c 2016-02-21 18:26:39 +0900 (ce7a1fd) @@ -296,7 +296,7 @@ selector_fuzzy_search(grn_ctx *ctx, grn_obj *table, grn_obj *index, grn_obj *target = NULL; grn_obj *obj; grn_obj *query; - grn_obj *hash_args_ptr; + grn_obj *option_ptr; uint32_t max_distance = 1; uint32_t prefix_length = 0; uint32_t prefix_match_size = 0; @@ -319,11 +319,11 @@ selector_fuzzy_search(grn_ctx *ctx, grn_obj *table, grn_obj *index, void *key; grn_obj *value; int key_size; - hash_args_ptr = args[3]; - if (hash_args_ptr->header.type == GRN_PTR) { - grn_obj *hash; - hash = GRN_PTR_VALUE(hash_args_ptr); - if (hash->header.type != GRN_TABLE_HASH_KEY) { + option_ptr = args[3]; + if (option_ptr->header.type == GRN_PTR) { + grn_obj *option; + option = GRN_PTR_VALUE(option_ptr); + if (option->header.type != GRN_TABLE_HASH_KEY) { GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, "fuzzy_search(): " "3rd argument must be object literal: <%.*s>", @@ -331,7 +331,7 @@ selector_fuzzy_search(grn_ctx *ctx, grn_obj *table, grn_obj *index, goto exit; } - cursor = grn_hash_cursor_open(ctx, (grn_hash *)hash, + cursor = grn_hash_cursor_open(ctx, (grn_hash *)option, NULL, 0, NULL, 0, 0, -1, 0); if (!cursor) { -------------- next part -------------- HTML����������������������������... Download