Kouhei Sutou
null+****@clear*****
Sat Nov 5 16:28:31 JST 2016
Kouhei Sutou 2016-11-05 16:28:31 +0900 (Sat, 05 Nov 2016) New Revision: 2d31e8745bfafcf2eaa832d1a64780359d57af93 https://github.com/ranguba/rroonga/commit/2d31e8745bfafcf2eaa832d1a64780359d57af93 Message: Use rb_grn_equal_option() Modified files: ext/groonga/rb-grn-table.c Modified: ext/groonga/rb-grn-table.c (+11 -18) =================================================================== --- ext/groonga/rb-grn-table.c 2016-11-05 16:27:39 +0900 (a49433b) +++ ext/groonga/rb-grn-table.c 2016-11-05 16:28:31 +0900 (851931c) @@ -374,7 +374,7 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self) grn_ctx *context = NULL; grn_obj *table; grn_obj *value_type, *column; - char *name = NULL, *path = NULL, *index_size = NULL; + char *name = NULL, *path = NULL; unsigned name_size = 0; grn_column_flags flags = GRN_OBJ_COLUMN_INDEX; VALUE rb_name, rb_value_type; @@ -449,23 +449,16 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self) if (RVAL2CBOOL(rb_with_position)) flags |= GRN_OBJ_WITH_POSITION; - if (!NIL_P(rb_size)) { - if (rb_type(rb_size) != T_SYMBOL) { - rb_raise(rb_eArgError, - ":size must be nil, :small or :medium: <%" PRIsVALUE ">", - rb_size); - } else { - index_size = RSYMBOL2CSTR(rb_size); - } - if (strcmp(index_size, "small") == 0) { - flags |= GRN_OBJ_INDEX_SMALL; - } else if (strcmp(index_size, "medium") == 0) { - flags |= GRN_OBJ_INDEX_MEDIUM; - } else { - rb_raise(rb_eArgError, - ":size must be nil, :small or :medium: <%" PRIsVALUE ">", - rb_size); - } + if (NIL_P(rb_size)) { + /* do nothing */ + } else if (rb_grn_equal_option(rb_size, "small")) { + flags |= GRN_OBJ_INDEX_SMALL; + } else if (rb_grn_equal_option(rb_size, "medium")) { + flags |= GRN_OBJ_INDEX_MEDIUM; + } else { + rb_raise(rb_eArgError, + ":size must be nil, :small or :medium: <%" PRIsVALUE ">", + rb_size); } if (!NIL_P(rb_source) && !NIL_P(rb_sources)) -------------- next part -------------- HTML����������������������������...Download
