nobu	2010-05-16 10:49:49 +0900 (Sun, 16 May 2010)

  New Revision: 27805

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27805

  Log:
    * ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
      a patch by Masaya TARUI <tarui AT prx.jp>.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/iconv/iconv.c
    branches/ruby_1_8/version.h
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/iconv/iconv.c
    trunk/ChangeLog
    trunk/ext/iconv/iconv.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27804)
+++ ChangeLog	(revision 27805)
@@ -1,3 +1,8 @@
+Sun May 16 10:49:47 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* configure.in: can not load libruby.so if gcc is used with
Index: ext/iconv/iconv.c
===================================================================
--- ext/iconv/iconv.c	(revision 27804)
+++ ext/iconv/iconv.c	(revision 27805)
@@ -178,7 +178,7 @@
 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);
 }
Index: ruby_1_8/ext/iconv/iconv.c
===================================================================
--- ruby_1_8/ext/iconv/iconv.c	(revision 27804)
+++ ruby_1_8/ext/iconv/iconv.c	(revision 27805)
@@ -151,7 +151,7 @@
 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);
 }
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 27804)
+++ ruby_1_8/ChangeLog	(revision 27805)
@@ -1,3 +1,8 @@
+Sun May 16 10:49:47 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
+	  a patch by Masaya TARUI <tarui AT prx.jp>.
+
 Sat May 15 17:16:15 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 27804)
+++ ruby_1_8/version.h	(revision 27805)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-05-15"
+#define RUBY_RELEASE_DATE "2010-05-16"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100515
+#define RUBY_RELEASE_CODE 20100516
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 16
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27804)
+++ ruby_1_9_2/ChangeLog	(revision 27805)
@@ -1,3 +1,8 @@
+Sun May 16 10:49:47 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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:23:00 2010  Yutaka Kanemoto  <kanemoto@r...>
 
 	* configure.in: can not load libruby.so if gcc is used with
Index: ruby_1_9_2/ext/iconv/iconv.c
===================================================================
--- ruby_1_9_2/ext/iconv/iconv.c	(revision 27804)
+++ ruby_1_9_2/ext/iconv/iconv.c	(revision 27805)
@@ -178,7 +178,7 @@
 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);
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/