nobu	2010-06-03 19:33:57 +0900 (Thu, 03 Jun 2010)

  New Revision: 28148

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

  Log:
    * ext/dl/cfunc.c (rb_dlcfunc_inspect): suppress warnings by
      rb_sprintf.
    
    * ext/dl/cptr.c (rb_dlptr_s_malloc): suppress warnings.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/dl/cfunc.c
    branches/ruby_1_9_2/ext/dl/cptr.c
    trunk/ChangeLog
    trunk/ext/dl/cfunc.c
    trunk/ext/dl/cptr.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28147)
+++ ChangeLog	(revision 28148)
@@ -1,3 +1,10 @@
+Thu Jun  3 19:33:51 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_inspect): suppress warnings by
+	  rb_sprintf.
+
+	* ext/dl/cptr.c (rb_dlptr_s_malloc): suppress warnings.
+
 Thu Jun  3 18:58:28 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* load.c (ruby_init_ext): statically linked extensions have no
Index: ext/dl/cfunc.c
===================================================================
--- ext/dl/cfunc.c	(revision 28147)
+++ ext/dl/cfunc.c	(revision 28148)
@@ -284,25 +284,15 @@
 static VALUE
 rb_dlcfunc_inspect(VALUE self)
 {
-    VALUE val;
-    char  *str;
-    int str_size;
     struct cfunc_data *cfunc;
 
     TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
 
-    str_size = (cfunc->name ? strlen(cfunc->name) : 0) + 100;
-    str = ruby_xmalloc(str_size);
-    snprintf(str, str_size - 1,
-	     "#<DL::CFunc:%p ptr=%p type=%d name='%s'>",
+    return rb_sprintf("#<DL::CFunc:%p ptr=%p type=%d name='%s'>",
 	     cfunc,
 	     cfunc->ptr,
 	     cfunc->type,
 	     cfunc->name ? cfunc->name : "");
-    val = rb_tainted_str_new2(str);
-    ruby_xfree(str);
-
-    return val;
 }
 
 
Index: ext/dl/cptr.c
===================================================================
--- ext/dl/cptr.c	(revision 28147)
+++ ext/dl/cptr.c	(revision 28148)
@@ -186,7 +186,7 @@
 rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
 {
     VALUE size, sym, obj;
-    int   s;
+    long s;
     freefunc_t f;
 
     switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28147)
+++ ruby_1_9_2/ChangeLog	(revision 28148)
@@ -1,3 +1,10 @@
+Thu Jun  3 19:33:51 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_inspect): suppress warnings by
+	  rb_sprintf.
+
+	* ext/dl/cptr.c (rb_dlptr_s_malloc): suppress warnings.
+
 Thu Jun  3 18:58:28 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* load.c (ruby_init_ext): statically linked extensions have no
Index: ruby_1_9_2/ext/dl/cfunc.c
===================================================================
--- ruby_1_9_2/ext/dl/cfunc.c	(revision 28147)
+++ ruby_1_9_2/ext/dl/cfunc.c	(revision 28148)
@@ -284,25 +284,15 @@
 static VALUE
 rb_dlcfunc_inspect(VALUE self)
 {
-    VALUE val;
-    char  *str;
-    int str_size;
     struct cfunc_data *cfunc;
 
     TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
 
-    str_size = (cfunc->name ? strlen(cfunc->name) : 0) + 100;
-    str = ruby_xmalloc(str_size);
-    snprintf(str, str_size - 1,
-	     "#<DL::CFunc:%p ptr=%p type=%d name='%s'>",
+    return rb_sprintf("#<DL::CFunc:%p ptr=%p type=%d name='%s'>",
 	     cfunc,
 	     cfunc->ptr,
 	     cfunc->type,
 	     cfunc->name ? cfunc->name : "");
-    val = rb_tainted_str_new2(str);
-    ruby_xfree(str);
-
-    return val;
 }
 
 
Index: ruby_1_9_2/ext/dl/cptr.c
===================================================================
--- ruby_1_9_2/ext/dl/cptr.c	(revision 28147)
+++ ruby_1_9_2/ext/dl/cptr.c	(revision 28148)
@@ -186,7 +186,7 @@
 rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
 {
     VALUE size, sym, obj;
-    int   s;
+    long s;
     freefunc_t f;
 
     switch (rb_scan_args(argc, argv, "11", &size, &sym)) {

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