summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-06 11:31:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-06 11:31:40 +0000
commit32d3f688ec3490035daba780a1e03f1310a3c43e (patch)
tree60f143d0e885bc90f6e83c7f806f7aca26ca2e08
parent7bc0dd830869fe6b31e54c7cddc869d8b97317a0 (diff)
* ext/zlib/zlib.c (zstream_end): should return value. (backported
from CVS HEAD) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/zlib/zlib.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a8658dddc3..a54445c2d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 6 20:31:07 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/zlib/zlib.c (zstream_end): should return value. (backported
+ from CVS HEAD)
+
Thu Jan 6 19:55:13 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_close): didn't close socket handle.
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 7e4baee889..b5e016eebb 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -679,7 +679,7 @@ zstream_end(z)
if (RTEST(ruby_debug)) {
rb_warning("attempt to close uninitialized zstream; ignored.");
}
- return;
+ return Qnil;
}
if (z->flags & ZSTREAM_FLAG_IN_STREAM) {
if (RTEST(ruby_debug)) {