nobu	2008-07-23 18:03:33 +0900 (Wed, 23 Jul 2008)

  New Revision: 18185

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

  Log:
    * ext/dl/dl.c (rb_ary_to_ptr), ext/dl/ptr.c (rb_dlmem_delete):
      suppress warnings.
    
    * ext/dl/ptr.c (rb_dlptr_inspect), ext/dl/sym.c (rb_dlsym_inspect):
      use %p conversion.
    
    * ext/dl/sym.c (rb_dlsym_guardcall): prevent guard from optimization.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/dl/dl.c
    branches/ruby_1_8/ext/dl/ptr.c
    branches/ruby_1_8/ext/dl/sym.c

Index: ruby_1_8/ext/dl/dl.c
===================================================================
--- ruby_1_8/ext/dl/dl.c	(revision 18184)
+++ ruby_1_8/ext/dl/dl.c	(revision 18185)
@@ -547,6 +547,8 @@
   case 0:
     ptr = rb_ary2cary(0, self, &size);
     break;
+  default:
+    return Qnil;
   }
   if (ptr) {
       VALUE p = rb_dlptr_new(ptr, size, dlfree);
Index: ruby_1_8/ext/dl/ptr.c
===================================================================
--- ruby_1_8/ext/dl/ptr.c	(revision 18184)
+++ ruby_1_8/ext/dl/ptr.c	(revision 18185)
@@ -18,8 +18,9 @@
 static void
 rb_dlmem_delete(void *ptr)
 {
+  st_data_t data = (st_data_t)ptr;
   rb_secure(4);
-  st_delete(st_memory_table, (st_data_t*)&ptr, NULL);
+  st_delete(st_memory_table, &data, NULL);
 }
 
 static void
@@ -458,7 +459,7 @@
   char str[1024];
 
   Data_Get_Struct(self, struct ptr_data, data);
-  snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>",
+  snprintf(str, 1023, "#<%s:%p ptr=%p size=%ld free=0x%lx>",
 	   rb_class2name(CLASS_OF(self)), data, data->ptr, data->size,
 	   (long)data->free);
   return rb_str_new2(str);
Index: ruby_1_8/ext/dl/sym.c
===================================================================
--- ruby_1_8/ext/dl/sym.c	(revision 18184)
+++ ruby_1_8/ext/dl/sym.c	(revision 18185)
@@ -268,7 +268,7 @@
   str_size = RSTRING(proto)->len + 100;
   str = dlmalloc(str_size);
   snprintf(str, str_size - 1,
-          "#<DL::Symbol:0x%lx func=0x%lx '%s'>",
+          "#<DL::Symbol:%p func=%p '%s'>",
 	   sym, sym->func, RSTRING(proto)->ptr);
   val = rb_tainted_str_new2(str);
   dlfree(str);
@@ -430,6 +430,7 @@
   default:
     return 0;
   }
+  (void)guard;
   return 1;
 }
 # ifdef __MSVC_RUNTIME_CHECKS
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18184)
+++ ruby_1_8/ChangeLog	(revision 18185)
@@ -1,5 +1,13 @@
-Wed Jul 23 17:51:18 2008  Nobuyoshi Nakada  <nobu@r...>
+Wed Jul 23 18:03:31 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* ext/dl/dl.c (rb_ary_to_ptr), ext/dl/ptr.c (rb_dlmem_delete):
+	  suppress warnings.
+
+	* ext/dl/ptr.c (rb_dlptr_inspect), ext/dl/sym.c (rb_dlsym_inspect):
+	  use %p conversion.
+
+	* ext/dl/sym.c (rb_dlsym_guardcall): prevent guard from optimization.
+
 	* ext/nkf/nkf-utf8/nkf.c (options): operators without any effect.
 
 	* ext/socket/socket.c (init_inetsock_internal): suppress warnings.

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