diff options
author | ttate <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-08-04 13:49:13 +0000 |
---|---|---|
committer | ttate <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-08-04 13:49:13 +0000 |
commit | 45a08a4296b57df13190cb9065ee44974f44c7ce (patch) | |
tree | 29fe0a2bb1690ae0a205c790809ec1867714862a /ext/dl/ptr.c | |
parent | 14859cdf948e6f9ebbb272867f9969fe95c91faa (diff) |
Conform to the allocation framework.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dl/ptr.c')
-rw-r--r-- | ext/dl/ptr.c | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c index 60b7f71860..1a31861c8f 100644 --- a/ext/dl/ptr.c +++ b/ext/dl/ptr.c @@ -155,9 +155,30 @@ rb_dlptr2cptr(VALUE val) } static VALUE -rb_dlptr_s_new(int argc, VALUE argv[], VALUE klass) +rb_dlptr_s_allocate(VALUE klass) +{ + VALUE obj; + struct ptr_data *data; + + obj = Data_Make_Struct(klass, struct ptr_data, 0, dlptr_free, data); + data->ptr = 0; + data->free = 0; + data->ctype = DLPTR_CTYPE_UNKNOWN; + data->stype = NULL; + data->ssize = NULL; + data->slen = 0; + data->size = 0; + data->ids = NULL; + data->ids_num = 0; + + return obj; +} + +static VALUE +rb_dlptr_initialize(int argc, VALUE argv[], VALUE self) { VALUE ptr, sym, obj, size; + struct ptr_data *data; void *p = NULL; freefunc_t f = NULL; long s = 0; @@ -179,11 +200,14 @@ rb_dlptr_s_new(int argc, VALUE argv[], VALUE klass) rb_bug("rb_dlptr_s_new"); }; - obj = rb_dlptr_new(p,s,f); - - rb_obj_call_init(obj, argc, argv); + if( p ){ + Data_Get_Struct(self, struct ptr_data, data); + data->ptr = p; + data->size = s; + data->free = f; + } - return obj; + return Qnil; } static VALUE @@ -210,12 +234,6 @@ rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass) return obj; } -static VALUE -rb_dlptr_init(int argc, VALUE argv[], VALUE self) -{ - return Qnil; -} - VALUE rb_dlptr_to_i(VALUE self) { @@ -1002,10 +1020,10 @@ rb_dlmem_each(VALUE self) void Init_dlptr() { - rb_cDLPtrData = rb_define_class_under(rb_mDL, "PtrData", rb_cData); - rb_define_singleton_method(rb_cDLPtrData, "new", rb_dlptr_s_new, -1); + rb_cDLPtrData = rb_define_class_under(rb_mDL, "PtrData", rb_cObject); + rb_define_singleton_method(rb_cDLPtrData, "allocate", rb_dlptr_s_allocate, 0); rb_define_singleton_method(rb_cDLPtrData, "malloc", rb_dlptr_s_malloc, -1); - rb_define_method(rb_cDLPtrData, "initialize", rb_dlptr_init, -1); + rb_define_method(rb_cDLPtrData, "initialize", rb_dlptr_initialize, -1); rb_define_method(rb_cDLPtrData, "free=", rb_dlptr_free_set, 1); rb_define_method(rb_cDLPtrData, "free", rb_dlptr_free_get, 0); rb_define_method(rb_cDLPtrData, "to_i", rb_dlptr_to_i, 0); |