summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/zlib/zlib.c4
-rw-r--r--test/zlib/test_zlib.rb4
-rw-r--r--version.h4
4 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 91ba135d46..11bb47c732 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 4 00:14:55 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
+ before rb_str_resurrect.
+
Thu Feb 3 20:04:44 2011 Tanaka Akira <akr@fsij.org>
* ext/curses/curses.c (CHECK): unused macro removed.
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 5289f83583..00e584134c 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -1998,7 +1998,6 @@ gzfile_raise(struct gzfile *gz, VALUE klass, const char *message)
{
VALUE exc = rb_exc_new2(klass, message);
if (!NIL_P(gz->z.input)) {
- VALUE rb_str_resurrect(VALUE);
rb_ivar_set(exc, id_input, rb_str_resurrect(gz->z.input));
}
rb_exc_raise(exc);
@@ -2471,8 +2470,7 @@ gzfile_reader_get_unused(struct gzfile *gz)
}
if (NIL_P(gz->z.input)) return Qnil;
- str = rb_str_dup(gz->z.input);
- str = rb_str_resurrect(str);
+ str = rb_str_resurrect(gz->z.input);
OBJ_TAINT(str); /* for safe */
return str;
}
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb
index 82352238ca..d118f7e503 100644
--- a/test/zlib/test_zlib.rb
+++ b/test/zlib/test_zlib.rb
@@ -86,7 +86,7 @@ if defined? Zlib
def test_adler
z = Zlib::Deflate.new
z << "foo"
- s = z.finish
+ z.finish
assert_equal(0x02820145, z.adler)
end
@@ -95,7 +95,7 @@ if defined? Zlib
assert_equal(false, z.finished?)
z << "foo"
assert_equal(false, z.finished?)
- s = z.finish
+ z.finish
assert_equal(true, z.finished?)
z.close
assert_raise(Zlib::Error) { z.finished? }
diff --git a/version.h b/version.h
index 91f2807b22..367f98d936 100644
--- a/version.h
+++ b/version.h
@@ -1,11 +1,11 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_RELEASE_DATE "2011-02-03"
+#define RUBY_RELEASE_DATE "2011-02-04"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
#define RUBY_RELEASE_YEAR 2011
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
#include "ruby/version.h"