yugui	2009-05-21 23:47:47 +0900 (Thu, 21 May 2009)

  New Revision: 23518

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23518

  Log:
    merges r23385 from trunk into ruby_1_9_1.
    --
    * 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].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/dl/cfunc.c
    branches/ruby_1_9_1/ext/dl/cptr.c
    branches/ruby_1_9_1/ext/dl/dl.h
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23517)
+++ ruby_1_9_1/ChangeLog	(revision 23518)
@@ -1,5 +1,11 @@
-Sun May 10 10:40:02 2009  Nobuyoshi Nakada  <nobu@r...>
+Sun May 10 11:13:19 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* 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].
+
 	* ext/dl/lib/dl/cparser.rb (DL::CParser#parse_signature): strips
 	  spaces.  based on a patch from Takashi Tamura in [ruby-dev:38398].
 
Index: ruby_1_9_1/ext/dl/cfunc.c
===================================================================
--- ruby_1_9_1/ext/dl/cfunc.c	(revision 23517)
+++ ruby_1_9_1/ext/dl/cfunc.c	(revision 23518)
@@ -43,8 +43,9 @@
 
 
 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 @@
   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)
 {
Index: ruby_1_9_1/ext/dl/dl.h
===================================================================
--- ruby_1_9_1/ext/dl/dl.h	(revision 23517)
+++ ruby_1_9_1/ext/dl/dl.h	(revision 23518)
@@ -217,6 +217,7 @@
 #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);
Index: ruby_1_9_1/ext/dl/cptr.c
===================================================================
--- ruby_1_9_1/ext/dl/cptr.c	(revision 23517)
+++ ruby_1_9_1/ext/dl/cptr.c	(revision 23518)
@@ -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 @@
   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 @@
     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 @@
 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;
 }
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23517)
+++ ruby_1_9_1/version.h	(revision 23518)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 135
+#define RUBY_PATCHLEVEL 136
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/