From f449c04a3648f56a535399d4108b738e36059455 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 10 Dec 2003 08:26:36 +0000 Subject: * io.c (read_all): should return given string even if data read is empty. [ruby-dev:22207] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/iconv/iconv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ext/iconv') diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 90bf024afb..5327797856 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -426,7 +426,7 @@ iconv_convert } else { /* Some iconv() have a bug, return *outlen out of range */ - sprintf(errmsg, "bug?(output length = %d)", sizeof(buffer) - outlen); + sprintf(errmsg, "bug?(output length = %ld)", sizeof(buffer) - outlen); error = rb_eIconvOutOfRange; } @@ -836,7 +836,6 @@ void Init_iconv _((void)) { VALUE rb_cIconv = rb_define_class("Iconv", rb_cData); - VALUE metaclass = RBASIC(rb_cIconv)->klass; rb_define_alloc_func(rb_cIconv, iconv_s_allocate); rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, 2); -- cgit v1.2.3