From ecbad6dfa87b78832294e3eff7a64f5d94215f87 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 16 May 2015 12:17:14 +0000 Subject: gc.c: rename alloc as wrap * gc.c (rb_data_object_wrap, rb_data_typed_object_wrap): rename alloc as wrap. these functions do not allocate data pointers but just wrap the given pointers. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- gc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gc.c') diff --git a/gc.c b/gc.c index 53c0ec5dd4..7f1d77c4df 100644 --- a/gc.c +++ b/gc.c @@ -30,7 +30,7 @@ #include #include -#undef rb_data_object_alloc +#undef rb_data_object_wrap #ifndef __has_feature # define __has_feature(x) 0 @@ -1806,7 +1806,7 @@ rb_imemo_new_debug(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0, #endif VALUE -rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree) +rb_data_object_wrap(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree) { if (klass) Check_Type(klass, T_CLASS); return newobj_of(klass, T_DATA, (VALUE)dmark, (VALUE)dfree, (VALUE)datap); @@ -1815,13 +1815,13 @@ rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_F VALUE rb_data_object_zalloc(VALUE klass, size_t size, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree) { - VALUE obj = rb_data_object_alloc(klass, 0, dmark, dfree); + VALUE obj = rb_data_object_wrap(klass, 0, dmark, dfree); DATA_PTR(obj) = xcalloc(1, size); return obj; } VALUE -rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type) +rb_data_typed_object_wrap(VALUE klass, void *datap, const rb_data_type_t *type) { if (klass) Check_Type(klass, T_CLASS); return newobj_of(klass, T_DATA | (type->flags & ~T_MASK), (VALUE)type, (VALUE)1, (VALUE)datap); @@ -1830,7 +1830,7 @@ rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type) VALUE rb_data_typed_object_zalloc(VALUE klass, size_t size, const rb_data_type_t *type) { - VALUE obj = rb_data_typed_object_alloc(klass, 0, type); + VALUE obj = rb_data_typed_object_wrap(klass, 0, type); DATA_PTR(obj) = xcalloc(1, size); return obj; } -- cgit v1.2.3