Kouhei Sutou
null+****@clear*****
Sun Mar 22 17:33:28 JST 2015
Kouhei Sutou 2015-03-22 17:33:28 +0900 (Sun, 22 Mar 2015) New Revision: da8dbbf9d9cd771e5eb9ef5b57415c540d205ff8 https://github.com/ranguba/rroonga/commit/da8dbbf9d9cd771e5eb9ef5b57415c540d205ff8 Message: Use rb_str_new_cstr() instead of new2() Modified files: ext/groonga/rb-grn-context.c ext/groonga/rb-grn-index-column.c ext/groonga/rb-grn-logger.c ext/groonga/rb-grn-object.c ext/groonga/rb-grn-plugin.c ext/groonga/rb-grn-query-logger.c ext/groonga/rb-grn-table-key-support.c ext/groonga/rb-grn-table.c ext/groonga/rb-grn-utils.c ext/groonga/rb-grn.h ext/groonga/rb-groonga.c Modified: ext/groonga/rb-grn-context.c (+1 -1) =================================================================== --- ext/groonga/rb-grn-context.c 2015-03-22 17:23:45 +0900 (3430778) +++ ext/groonga/rb-grn-context.c 2015-03-22 17:33:28 +0900 (9f17001) @@ -534,7 +534,7 @@ rb_grn_context_inspect (VALUE self) context = SELF(self); - inspected = rb_str_new2("#<"); + inspected = rb_str_new_cstr("#<"); rb_str_concat(inspected, rb_inspect(rb_obj_class(self))); rb_str_cat2(inspected, " "); Modified: ext/groonga/rb-grn-index-column.c (+1 -1) =================================================================== --- ext/groonga/rb-grn-index-column.c 2015-03-22 17:23:45 +0900 (8f80ea5) +++ ext/groonga/rb-grn-index-column.c 2015-03-22 17:33:28 +0900 (59e07bd) @@ -181,7 +181,7 @@ rb_grn_index_column_inspect (VALUE self) { VALUE inspected; - inspected = rb_str_new2(""); + inspected = rb_str_new_cstr(""); rb_grn_object_inspect_header(self, inspected); rb_grn_object_inspect_content(self, inspected); rb_grn_index_column_inspect_content(self, inspected); Modified: ext/groonga/rb-grn-logger.c (+5 -5) =================================================================== --- ext/groonga/rb-grn-logger.c 2015-03-22 17:23:45 +0900 (9a5d095) +++ ext/groonga/rb-grn-logger.c 2015-03-22 17:33:28 +0900 (dcb94d1) @@ -159,10 +159,10 @@ rb_grn_logger_log (grn_ctx *ctx, grn_log_level level, /* TODO: use rb_protect(). */ rb_funcall(handler, id_log, 5, GRNLOGLEVEL2RVAL(level), - rb_str_new2(timestamp), - rb_str_new2(title), - rb_str_new2(message), - rb_str_new2(location)); + rb_str_new_cstr(timestamp), + rb_str_new_cstr(title), + rb_str_new_cstr(message), + rb_str_new_cstr(location)); } static void @@ -359,7 +359,7 @@ rb_grn_logger_s_get_path (VALUE klass) path = grn_default_logger_get_path(); if (path) { - rb_path = rb_str_new2(path); + rb_path = rb_str_new_cstr(path); } return rb_path; } Modified: ext/groonga/rb-grn-object.c (+30 -30) =================================================================== --- ext/groonga/rb-grn-object.c 2015-03-22 17:23:45 +0900 (23fb760) +++ ext/groonga/rb-grn-object.c 2015-03-22 17:33:28 +0900 (3e25b70) @@ -837,13 +837,13 @@ rb_grn_object_inspect_content_flags_with_label (VALUE inspected, if (0) { if (flags & GRN_OBJ_TABLE_HASH_KEY) - rb_ary_push(inspected_flags, rb_str_new2("TABLE_HASH_KEY")); + rb_ary_push(inspected_flags, rb_str_new_cstr("TABLE_HASH_KEY")); if (flags & GRN_OBJ_TABLE_PAT_KEY) - rb_ary_push(inspected_flags, rb_str_new2("TABLE_PAT_KEY")); + rb_ary_push(inspected_flags, rb_str_new_cstr("TABLE_PAT_KEY")); if (flags & GRN_OBJ_TABLE_DAT_KEY) - rb_ary_push(inspected_flags, rb_str_new2("TABLE_DAT_KEY")); + rb_ary_push(inspected_flags, rb_str_new_cstr("TABLE_DAT_KEY")); if (flags & GRN_OBJ_TABLE_NO_KEY) - rb_ary_push(inspected_flags, rb_str_new2("TABLE_NO_KEY")); + rb_ary_push(inspected_flags, rb_str_new_cstr("TABLE_NO_KEY")); } switch (object->header.type) { @@ -851,20 +851,20 @@ rb_grn_object_inspect_content_flags_with_label (VALUE inspected, case GRN_COLUMN_VAR_SIZE: case GRN_TYPE: if (flags & GRN_OBJ_KEY_VAR_SIZE) { - rb_ary_push(inspected_flags, rb_str_new2("KEY_VAR_SIZE")); + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_VAR_SIZE")); } else { switch (flags & GRN_OBJ_KEY_MASK) { case GRN_OBJ_KEY_UINT: - rb_ary_push(inspected_flags, rb_str_new2("KEY_UINT")); + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_UINT")); break; case GRN_OBJ_KEY_INT: - rb_ary_push(inspected_flags, rb_str_new2("KEY_INT")); + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_INT")); break; case GRN_OBJ_KEY_FLOAT: - rb_ary_push(inspected_flags, rb_str_new2("KEY_FLOAT")); + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_FLOAT")); break; case GRN_OBJ_KEY_GEO_POINT: - rb_ary_push(inspected_flags, rb_str_new2("KEY_GEO_POINT")); + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_GEO_POINT")); break; default: break; @@ -880,9 +880,9 @@ rb_grn_object_inspect_content_flags_with_label (VALUE inspected, case GRN_TABLE_PAT_KEY: case GRN_TABLE_DAT_KEY: if (flags & GRN_OBJ_KEY_WITH_SIS) - rb_ary_push(inspected_flags, rb_str_new2("KEY_WITH_SIS")); + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_WITH_SIS")); if (flags & GRN_OBJ_KEY_NORMALIZE) - rb_ary_push(inspected_flags, rb_str_new2("KEY_NORMALIZE")); + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_NORMALIZE")); break; default: break; @@ -890,57 +890,57 @@ rb_grn_object_inspect_content_flags_with_label (VALUE inspected, if (0) { if (flags & GRN_OBJ_COLUMN_SCALAR) - rb_ary_push(inspected_flags, rb_str_new2("COLUMN_SCALAR")); + rb_ary_push(inspected_flags, rb_str_new_cstr("COLUMN_SCALAR")); if (flags & GRN_OBJ_COLUMN_VECTOR) - rb_ary_push(inspected_flags, rb_str_new2("COLUMN_VECTOR")); + rb_ary_push(inspected_flags, rb_str_new_cstr("COLUMN_VECTOR")); if (flags & GRN_OBJ_COLUMN_INDEX) - rb_ary_push(inspected_flags, rb_str_new2("COLUMN_INDEX")); + rb_ary_push(inspected_flags, rb_str_new_cstr("COLUMN_INDEX")); } switch (object->header.type) { case GRN_COLUMN_FIX_SIZE: case GRN_COLUMN_VAR_SIZE: if (flags & GRN_OBJ_COMPRESS_ZLIB) - rb_ary_push(inspected_flags, rb_str_new2("COMPRESS_ZLIB")); + rb_ary_push(inspected_flags, rb_str_new_cstr("COMPRESS_ZLIB")); if (flags & GRN_OBJ_COMPRESS_LZ4) - rb_ary_push(inspected_flags, rb_str_new2("COMPRESS_LZ4")); + rb_ary_push(inspected_flags, rb_str_new_cstr("COMPRESS_LZ4")); break; case GRN_COLUMN_INDEX: if (flags & GRN_OBJ_WITH_SECTION) - rb_ary_push(inspected_flags, rb_str_new2("WITH_SECTION")); + rb_ary_push(inspected_flags, rb_str_new_cstr("WITH_SECTION")); if (flags & GRN_OBJ_WITH_WEIGHT) - rb_ary_push(inspected_flags, rb_str_new2("WITH_WEIGHT")); + rb_ary_push(inspected_flags, rb_str_new_cstr("WITH_WEIGHT")); if (flags & GRN_OBJ_WITH_POSITION) - rb_ary_push(inspected_flags, rb_str_new2("WITH_POSITION")); + rb_ary_push(inspected_flags, rb_str_new_cstr("WITH_POSITION")); break; default: break; } if (flags & GRN_OBJ_RING_BUFFER) - rb_ary_push(inspected_flags, rb_str_new2("RING_BUFFER")); + rb_ary_push(inspected_flags, rb_str_new_cstr("RING_BUFFER")); if (flags & GRN_OBJ_WITH_SUBREC) { - rb_ary_push(inspected_flags, rb_str_new2("WITH_SUBREC")); + rb_ary_push(inspected_flags, rb_str_new_cstr("WITH_SUBREC")); if (flags & GRN_OBJ_UNIT_DOCUMENT_SECTION) - rb_ary_push(inspected_flags, rb_str_new2("UNIT_DOCUMENT_SECTION")); + rb_ary_push(inspected_flags, rb_str_new_cstr("UNIT_DOCUMENT_SECTION")); if (flags & GRN_OBJ_UNIT_DOCUMENT_POSITION) - rb_ary_push(inspected_flags, rb_str_new2("UNIT_DOCUMENT_POSITION")); + rb_ary_push(inspected_flags, rb_str_new_cstr("UNIT_DOCUMENT_POSITION")); if (flags & GRN_OBJ_UNIT_SECTION_POSITION) - rb_ary_push(inspected_flags, rb_str_new2("UNIT_SECTION_POSITION")); + rb_ary_push(inspected_flags, rb_str_new_cstr("UNIT_SECTION_POSITION")); if (flags & GRN_OBJ_UNIT_USERDEF_DOCUMENT) - rb_ary_push(inspected_flags, rb_str_new2("UNIT_USERDEF_DOCUMENT")); + rb_ary_push(inspected_flags, rb_str_new_cstr("UNIT_USERDEF_DOCUMENT")); if (flags & GRN_OBJ_UNIT_USERDEF_SECTION) - rb_ary_push(inspected_flags, rb_str_new2("UNIT_USERDEF_SECTION")); + rb_ary_push(inspected_flags, rb_str_new_cstr("UNIT_USERDEF_SECTION")); if (flags & GRN_OBJ_UNIT_USERDEF_POSITION) - rb_ary_push(inspected_flags, rb_str_new2("UNIT_USERDEF_POSITION")); + rb_ary_push(inspected_flags, rb_str_new_cstr("UNIT_USERDEF_POSITION")); } rb_str_cat2(inspected, "<"); - rb_str_concat(inspected, rb_ary_join(inspected_flags, rb_str_new2("|"))); + rb_str_concat(inspected, rb_ary_join(inspected_flags, rb_str_new_cstr("|"))); rb_str_cat2(inspected, ">"); return inspected; @@ -1010,7 +1010,7 @@ rb_grn_object_inspect (VALUE self) { VALUE inspected; - inspected = rb_str_new2(""); + inspected = rb_str_new_cstr(""); rb_grn_object_inspect_header(self, inspected); rb_grn_object_inspect_content(self, inspected); rb_grn_object_inspect_footer(self, inspected); @@ -1064,7 +1064,7 @@ rb_grn_object_get_path (VALUE self) if (!path) return Qnil; else - return rb_str_new2(path); + return rb_str_new_cstr(path); } /* Modified: ext/groonga/rb-grn-plugin.c (+2 -2) =================================================================== --- ext/groonga/rb-grn-plugin.c 2015-03-22 17:23:45 +0900 (05d68f5) +++ ext/groonga/rb-grn-plugin.c 2015-03-22 17:33:28 +0900 (946805b) @@ -130,7 +130,7 @@ rb_grn_plugin_s_register (int argc, VALUE *argv, VALUE klass) static VALUE rb_grn_plugin_s_system_plugins_dir (VALUE klass) { - return rb_str_new2(grn_plugin_get_system_plugins_dir()); + return rb_str_new_cstr(grn_plugin_get_system_plugins_dir()); } /* @@ -142,7 +142,7 @@ rb_grn_plugin_s_system_plugins_dir (VALUE klass) static VALUE rb_grn_plugin_s_suffix (VALUE klass) { - return rb_str_new2(grn_plugin_get_suffix()); + return rb_str_new_cstr(grn_plugin_get_suffix()); } void Modified: ext/groonga/rb-grn-query-logger.c (+4 -4) =================================================================== --- ext/groonga/rb-grn-query-logger.c 2015-03-22 17:23:45 +0900 (e39bd15) +++ ext/groonga/rb-grn-query-logger.c 2015-03-22 17:33:28 +0900 (33ad1bb) @@ -58,9 +58,9 @@ rb_grn_query_logger_log (grn_ctx *ctx, unsigned int flag, /* TODO: use rb_protect(). */ rb_funcall(handler, id_log, 4, GRNQUERYLOGFLAGS2RVAL(flag), - rb_str_new2(timestamp), - rb_str_new2(info), - rb_str_new2(message)); + rb_str_new_cstr(timestamp), + rb_str_new_cstr(info), + rb_str_new_cstr(message)); } static void @@ -234,7 +234,7 @@ rb_grn_query_logger_s_get_path (VALUE klass) path = grn_default_query_logger_get_path(); if (path) { - rb_path = rb_str_new2(path); + rb_path = rb_str_new_cstr(path); } return rb_path; } Modified: ext/groonga/rb-grn-table-key-support.c (+1 -1) =================================================================== --- ext/groonga/rb-grn-table-key-support.c 2015-03-22 17:23:45 +0900 (505d312) +++ ext/groonga/rb-grn-table-key-support.c 2015-03-22 17:33:28 +0900 (c7ba3a3) @@ -196,7 +196,7 @@ rb_grn_table_key_support_inspect (VALUE self) { VALUE inspected; - inspected = rb_str_new2(""); + inspected = rb_str_new_cstr(""); rb_grn_object_inspect_header(self, inspected); rb_grn_object_inspect_content(self, inspected); rb_grn_table_inspect_content(self, inspected); Modified: ext/groonga/rb-grn-table.c (+1 -1) =================================================================== --- ext/groonga/rb-grn-table.c 2015-03-22 17:23:45 +0900 (6bc37ec) +++ ext/groonga/rb-grn-table.c 2015-03-22 17:33:28 +0900 (bca0b62) @@ -199,7 +199,7 @@ rb_grn_table_inspect (VALUE self) { VALUE inspected; - inspected = rb_str_new2(""); + inspected = rb_str_new_cstr(""); rb_grn_object_inspect_header(self, inspected); rb_grn_object_inspect_content(self, inspected); rb_grn_table_inspect_content(self, inspected); Modified: ext/groonga/rb-grn-utils.c (+1 -1) =================================================================== --- ext/groonga/rb-grn-utils.c 2015-03-22 17:23:45 +0900 (6238d20) +++ ext/groonga/rb-grn-utils.c 2015-03-22 17:33:28 +0900 (d9eb5e4) @@ -146,7 +146,7 @@ rb_grn_equal_option (VALUE option, const char *key) { VALUE key_string, key_symbol; - key_string = rb_str_new2(key); + key_string = rb_str_new_cstr(key); if (RVAL2CBOOL(rb_funcall(option, rb_intern("=="), 1, key_string))) return GRN_TRUE; Modified: ext/groonga/rb-grn.h (+1 -1) =================================================================== --- ext/groonga/rb-grn.h 2015-03-22 17:23:45 +0900 (4db7a52) +++ ext/groonga/rb-grn.h 2015-03-22 17:33:28 +0900 (6c065cf) @@ -603,7 +603,7 @@ VALUE rb_grn_column_expression_builder_build (VALUE self); -#define RB_GRN_INTERN(c_string) (rb_to_symbol(rb_str_new2(c_string))) +#define RB_GRN_INTERN(c_string) (rb_to_symbol(rb_str_new_cstr(c_string))) #define RVAL2CBOOL(object) (RTEST(object)) #define CBOOL2RVAL(boolean) ((boolean) ? Qtrue : Qfalse) Modified: ext/groonga/rb-groonga.c (+1 -1) =================================================================== --- ext/groonga/rb-groonga.c 2015-03-22 17:23:45 +0900 (f44a784) +++ ext/groonga/rb-groonga.c 2015-03-22 17:33:28 +0900 (f800e2c) @@ -62,7 +62,7 @@ rb_grn_init_runtime_version (VALUE mGrn) rb_ary_push(runtime_version, rb_Integer(micro)); if (component_end) { - tag = rb_str_new2(component_end + 1); + tag = rb_str_new_cstr(component_end + 1); } else { tag = Qnil; } -------------- next part -------------- HTML����������������������������...Download