kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 27799:27805:

Browse source 
* ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
	  a patch by Masaya TARUI <tarui AT prx.jp>.
	* ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
	  errno is not set.  [ruby-dev:41317]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-06-08 08:45:59 +00:00
parent 98e7a2abca
commit 1ab8a925be
3 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Tue Jun 8 17:45:36 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>.
Tue Jun 8 17:45:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
errno is not set. [ruby-dev:41317]
Tue Jun 8 17:32:37 2010 Tanaka Akira <akr@fsij.org> Tue Jun 8 17:32:37 2010 Tanaka Akira <akr@fsij.org>
* pack.c (pack_pack): call rb_quad_pack to preserve RangeError. * pack.c (pack_pack): call rb_quad_pack to preserve RangeError.

12
ext/iconv/iconv.c
View file

@ -146,6 +146,18 @@ map_charset
return StringValuePtr(*code); return StringValuePtr(*code);
} }
NORETURN(static void rb_iconv_sys_fail(const char *s));
static void
rb_iconv_sys_fail(const char *s)
{
if (errno == 0) {
rb_exc_raise(iconv_fail(rb_eIconvBrokenLibrary, Qnil, Qnil, NULL, s));
}
rb_sys_fail(s);
}
#define rb_sys_fail(s) rb_iconv_sys_fail(s)
static iconv_t static iconv_t
iconv_create iconv_create
#ifdef HAVE_PROTOTYPES #ifdef HAVE_PROTOTYPES

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-06-08" #define RUBY_RELEASE_DATE "2010-06-08"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20100608 #define RUBY_RELEASE_CODE 20100608
#define RUBY_PATCHLEVEL 285 #define RUBY_PATCHLEVEL 286
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8