Kouhei Sutou
null+****@clear*****
Fri Feb 7 16:05:13 JST 2014
Kouhei Sutou 2014-02-07 16:05:13 +0900 (Fri, 07 Feb 2014) New Revision: f2e3de8c7a984de0c4ba089dda22d53b8912c8b0 https://github.com/ranguba/rroonga/commit/f2e3de8c7a984de0c4ba089dda22d53b8912c8b0 Message: Follow grn_snip -> grn_obj change Modified files: ext/groonga/rb-grn-expression.c ext/groonga/rb-grn-snippet.c Modified: ext/groonga/rb-grn-expression.c (+3 -3) =================================================================== --- ext/groonga/rb-grn-expression.c 2014-02-06 01:25:22 +0900 (4fe6515) +++ ext/groonga/rb-grn-expression.c 2014-02-07 16:05:13 +0900 (2b696bb) @@ -1,6 +1,6 @@ /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - Copyright (C) 2009-2012 Kouhei Sutou <kou �� clear-code.com> + Copyright (C) 2009-2014 Kouhei Sutou <kou �� clear-code.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -624,7 +624,7 @@ rb_grn_expression_snippet (int argc, VALUE *argv, VALUE self) { grn_ctx *context = NULL; grn_obj *expression; - grn_snip *snippet; + grn_obj *snippet; VALUE options; VALUE rb_normalize, rb_skip_leading_spaces; VALUE rb_width, rb_max_results, rb_tags; @@ -714,7 +714,7 @@ rb_grn_expression_snippet (int argc, VALUE *argv, VALUE self) related_object = rb_ary_new3(2, self, rb_ary_new4(argc, argv)); rb_grn_context_check(context, related_object); - return GRNOBJECT2RVAL(Qnil, context, (grn_obj *)snippet, GRN_TRUE); + return GRNOBJECT2RVAL(Qnil, context, snippet, GRN_TRUE); } void Modified: ext/groonga/rb-grn-snippet.c (+6 -6) =================================================================== --- ext/groonga/rb-grn-snippet.c 2014-02-06 01:25:22 +0900 (0c9c9ed) +++ ext/groonga/rb-grn-snippet.c 2014-02-07 16:05:13 +0900 (8d0f328) @@ -1,6 +1,6 @@ /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - Copyright (C) 2009-2012 Kouhei Sutou <kou �� clear-code.com> + Copyright (C) 2009-2014 Kouhei Sutou <kou �� clear-code.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -83,7 +83,7 @@ static VALUE rb_grn_snippet_initialize (int argc, VALUE *argv, VALUE self) { grn_ctx *context = NULL; - grn_snip *snippet = NULL; + grn_obj *snippet = NULL; VALUE options; VALUE rb_context, rb_normalize, rb_skip_leading_spaces; VALUE rb_width, rb_max_results, rb_default_open_tag, rb_default_close_tag; @@ -148,7 +148,7 @@ rb_grn_snippet_initialize (int argc, VALUE *argv, VALUE self) mapping); rb_grn_context_check(context, rb_ary_new4(argc, argv)); - rb_grn_object_assign(Qnil, self, rb_context, context, (grn_obj *)snippet); + rb_grn_object_assign(Qnil, self, rb_context, context, snippet); rb_grn_context_register_floating_object(DATA_PTR(self)); rb_iv_set(self, "@context", rb_context); @@ -203,7 +203,7 @@ rb_grn_snippet_add_keyword (int argc, VALUE *argv, VALUE self) close_tag_length = RSTRING_LEN(rb_close_tag); } - rc = grn_snip_add_cond(context, (grn_snip *)snippet, + rc = grn_snip_add_cond(context, snippet, keyword, keyword_length, open_tag, open_tag_length, close_tag, close_tag_length); @@ -245,7 +245,7 @@ rb_grn_snippet_execute (VALUE self, VALUE rb_string) string = StringValuePtr(rb_string); string_length = RSTRING_LEN(rb_string); - rc = grn_snip_exec(context, (grn_snip *)snippet, string, string_length, + rc = grn_snip_exec(context, snippet, string, string_length, &n_results, &max_tagged_length); rb_grn_context_check(context, self); rb_grn_rc_check(rc, self); @@ -256,7 +256,7 @@ rb_grn_snippet_execute (VALUE self, VALUE rb_string) VALUE rb_result; unsigned result_length; - rc = grn_snip_get_result(context, (grn_snip *)snippet, + rc = grn_snip_get_result(context, snippet, i, result, &result_length); rb_grn_rc_check(rc, self); rb_result = rb_grn_context_rb_string_new(context, result, result_length); -------------- next part -------------- HTML����������������������������...다운로드
