knu	2008-06-07 23:57:16 +0900 (Sat, 07 Jun 2008)

  New Revision: 16875

  Modified files:
    trunk/ChangeLog
    trunk/ext/zlib/zlib.c

  Log:
    * ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
      initialize_copy; [ruby-list:45016].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16875&r2=16874&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/zlib/zlib.c?r1=16875&r2=16874&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16874)
+++ ChangeLog	(revision 16875)
@@ -1,3 +1,8 @@
+Sat Jun  7 23:47:35 2008  Akinori MUSHA  <knu@i...>
+
+	* ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
+	  initialize_copy; [ruby-list:45016].
+
 Sat Jun  7 22:15:02 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (VENDOR_DIR): use LIBDIR instead of PREFIX as well as
Index: ext/zlib/zlib.c
===================================================================
--- ext/zlib/zlib.c	(revision 16874)
+++ ext/zlib/zlib.c	(revision 16875)
@@ -1116,10 +1116,12 @@
 static VALUE
 rb_deflate_init_copy(VALUE self, VALUE orig)
 {
-    struct zstream *z1 = get_zstream(self);
-    struct zstream *z2 = get_zstream(orig);
+    struct zstream *z1, *z2;
     int err;
 
+    Data_Get_Struct(self, struct zstream, z1);
+    z2 = get_zstream(orig);
+
     err = deflateCopy(&z1->stream, &z2->stream);
     if (err != Z_OK) {
 	raise_zlib_error(err, 0);
@@ -3267,7 +3269,7 @@
     rb_define_singleton_method(cDeflate, "deflate", rb_deflate_s_deflate, -1);
     rb_define_alloc_func(cDeflate, rb_deflate_s_allocate);
     rb_define_method(cDeflate, "initialize", rb_deflate_initialize, -1);
-    rb_define_method(cDeflate, "initialize_copy", rb_deflate_init_copy, 0);
+    rb_define_method(cDeflate, "initialize_copy", rb_deflate_init_copy, 1);
     rb_define_method(cDeflate, "deflate", rb_deflate_deflate, -1);
     rb_define_method(cDeflate, "<<", rb_deflate_addstr, 1);
     rb_define_method(cDeflate, "flush", rb_deflate_flush, -1);

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