null+****@clear*****
null+****@clear*****
2010年 8月 9日 (月) 14:45:38 JST
Kouhei Sutou 2010-08-09 05:45:38 +0000 (Mon, 09 Aug 2010) New Revision: a736d891d4f54243b09f67ac4231a23ebd0fc3d0 Log: grn_table_sort_geo_ -> grn_geo_table_sort_. Modified files: lib/geo.c Modified: lib/geo.c (+4 -4) =================================================================== --- lib/geo.c 2010-08-09 05:22:08 +0000 (4e2a1fd) +++ lib/geo.c 2010-08-09 05:45:38 +0000 (030f03b) @@ -83,7 +83,7 @@ compute_min_and_max(grn_geo_point *base_point, int diff_bit, } static int -grn_table_sort_geo_detect_far_point(grn_ctx *ctx, grn_obj *table, grn_obj *index, +grn_geo_table_sort_detect_far_point(grn_ctx *ctx, grn_obj *table, grn_obj *index, grn_pat *pat, geo_entry *entries, grn_pat_cursor *pc, int n, int accessorp, grn_geo_point *base_point, @@ -198,7 +198,7 @@ typedef enum { } mesh_position; static int -grn_table_sort_geo_collect_points(grn_ctx *ctx, grn_obj *table, grn_obj *index, +grn_geo_table_sort_collect_points(grn_ctx *ctx, grn_obj *table, grn_obj *index, grn_pat *pat, geo_entry *entries, int n_entries, int n, int accessorp, @@ -441,13 +441,13 @@ grn_geo_table_sort(grn_ctx *ctx, grn_obj *table, int offset, int limit, geo_entry *ep; base_point = (grn_geo_point *)GRN_BULK_HEAD(arg); - n = grn_table_sort_geo_detect_far_point(ctx, table, index, pat, + n = grn_geo_table_sort_detect_far_point(ctx, table, index, pat, entries, pc, e, accessorp, base_point, &d_far, &diff_bit); grn_pat_cursor_close(ctx, pc); if (diff_bit > 0) { - n += grn_table_sort_geo_collect_points(ctx, table, index, pat, + n += grn_geo_table_sort_collect_points(ctx, table, index, pat, entries, n, e, accessorp, base_point, d_far, diff_bit); }