aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-16 01:49:49 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-16 01:49:49 +0000
commitd9615c85a370039b3d798eb04a77a6bf278c4e9e (patch)
tree016baf241150d08f8f66c7052d9de4be437ffd81
parentbbebd01d08c16304c4637be12f89eb4cf08f2889 (diff)
downloadruby-d9615c85a370039b3d798eb04a77a6bf278c4e9e.tar.gz
* ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
a patch by Masaya TARUI <tarui AT prx.jp>. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/iconv/iconv.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b9867151e0..6d32460cb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 16 10:49:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
+ a patch by Masaya TARUI <tarui AT prx.jp>.
+
Sun May 16 02:24:27 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
* configure.in: can not load libruby.so if gcc is used with
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index a25e9cb079..ff30c4e13a 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -178,7 +178,7 @@ static void
rb_iconv_sys_fail(const char *s)
{
if (errno == 0) {
- rb_raise(rb_eIconvBrokenLibrary, "%s", s);
+ rb_exc_raise(iconv_fail(rb_eIconvBrokenLibrary, Qnil, Qnil, NULL, s));
}
rb_sys_fail(s);
}