summaryrefslogtreecommitdiff
path: root/ext/iconv
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-10 08:26:36 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-10 08:26:36 +0000
commitf449c04a3648f56a535399d4108b738e36059455 (patch)
treececb154f054657360e54e8a4e249b804e1231536 /ext/iconv
parent6395c3b38de70621232102597ee24c1fd136ca1b (diff)
* 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
Diffstat (limited to 'ext/iconv')
-rw-r--r--ext/iconv/iconv.c3
1 files changed, 1 insertions, 2 deletions
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);