From e48ef5387231abe5eb94c72b06c4e0d1658ecd5f Mon Sep 17 00:00:00 2001 From: knu Date: Sun, 8 Jun 2008 17:44:33 +0000 Subject: * ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up initialize_copy; [ruby-list:45016], [ruby-list:45018]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/zlib/zlib.c | 11 ++++++++--- version.h | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e56bea18e0..aca5cc731b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 9 02:32:58 2008 Akinori MUSHA + + * ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up + initialize_copy; [ruby-list:45016], [ruby-list:45018]. + Sun Jun 8 04:32:33 2008 Kazuhiro NISHIYAMA * NEWS: Mention new constants. diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 1b89553772..d4c5028920 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1182,14 +1182,19 @@ static VALUE rb_deflate_init_copy(self, orig) VALUE self, 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); } + z1->input = NIL_P(z2->input) ? Qnil : rb_str_dup(z2->input); + z1->buf = NIL_P(z2->buf) ? Qnil : rb_str_dup(z2->buf); + z1->buf_filled = z2->buf_filled; z1->flags = z2->flags; return self; @@ -3371,7 +3376,7 @@ void Init_zlib() 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); diff --git a/version.h b/version.h index 2dd3e50c72..a4d28c5fcd 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2008-06-08" +#define RUBY_RELEASE_DATE "2008-06-09" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20080608 +#define RUBY_RELEASE_CODE 20080609 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 9 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3