* ext/dl/cfunc.c (rb_dlcfunc_instance_p): new function to check if

  the argument is an instance of DL::CFunc.

* ext/dl/cptr.c (rb_dlptr_initialize, rb_dlptr_s_malloc): checks
  if DL::CFunc.  [ruby-dev:38403].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23385 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 25 insertions, 10 deletions

diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c
index 20d3f53766..6110e14f55 100644
--- a/ext/dl/cfunc.c
+++ b/ext/dl/cfunc.c
@@ -43,8 +43,9 @@ rb_dl_set_win32_last_error(VALUE self, VALUE val)
 
 
 void
-dlcfunc_free(struct cfunc_data *data)
+dlcfunc_free(void *ptr)
 {
+    struct cfunc_data *data = ptr;
     if( data->name ){
 	xfree(data->name);
     }
@@ -107,6 +108,13 @@ rb_dlcfunc_s_allocate(VALUE klass)
     return obj;
 }
 
+int
+rb_dlcfunc_kind_p(VALUE func)
+{
+    if (TYPE(func) == T_DATA) return 0;
+    return RDATA(func)->dfree == dlcfunc_free;
+}
+
 VALUE
 rb_dlcfunc_initialize(int argc, VALUE argv[], VALUE self)
 {
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
index 4f1456d164..d2fa07771d 100644
--- a/ext/dl/cptr.c
+++ b/ext/dl/cptr.c
@@ -9,6 +9,18 @@
 
 VALUE rb_cDLCPtr;
 
+static inline freefunc_t
+get_freefunc(VALUE func)
+{
+    if (NIL_P(func)) {
+	return NULL;
+    }
+    if (rb_dlcfunc_kind_p(func)) {
+	return RCFUNC_DATA(func)->ptr;
+    }
+    return NUM2PTR(rb_Integer(func));
+}
+
 static ID id_to_ptr;
 
 static void
@@ -124,7 +136,7 @@ rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
       case 3:
 	p = (void*)(NUM2PTR(rb_Integer(ptr)));
 	s = NUM2LONG(size);
-	f = NIL_P(sym) ? NULL : RCFUNC_DATA(sym)->ptr;
+	f = get_freefunc(sym);
 	break;
       default:
 	rb_bug("rb_dlptr_initialize");
@@ -158,7 +170,7 @@ rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
 	break;
       case 2:
 	s = NUM2LONG(size);
-	f = RCFUNC_DATA(sym)->ptr;
+	f = get_freefunc(sym);
 	break;
       default:
 	rb_bug("rb_dlptr_s_malloc");
@@ -217,15 +229,9 @@ VALUE
 rb_dlptr_free_set(VALUE self, VALUE val)
 {
     struct ptr_data *data;
-    extern VALUE rb_cDLCFunc;
 
     Data_Get_Struct(self, struct ptr_data, data);
-    if( rb_obj_is_kind_of(val, rb_cDLCFunc) == Qtrue ){
-	data->free = RCFUNC_DATA(val)->ptr;
-    }
-    else{
-	data->free = NUM2PTR(rb_Integer(val));
-    }
+    data->free = get_freefunc(val);
 
     return Qnil;
 }
diff --git a/ext/dl/dl.h b/ext/dl/dl.h
index d47a3aa729..d06cad4e6b 100644
--- a/ext/dl/dl.h
+++ b/ext/dl/dl.h
@@ -216,6 +216,7 @@ struct ptr_data {
 #define RPTR_DATA(obj) ((struct ptr_data *)(DATA_PTR(obj)))
 
 VALUE rb_dlcfunc_new(void (*func)(), int dltype, const char * name, ID calltype);
+int rb_dlcfunc_kind_p(VALUE func);
 VALUE rb_dlptr_new(void *ptr, long size, freefunc_t func);
 VALUE rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func);
 VALUE rb_dlptr_malloc(long size, freefunc_t func);