mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* transcode.c (rb_econv_open): return NULL on error.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8f9ed3c464
commit
7c2c7ea315
2 changed files with 5 additions and 1 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
Sun Aug 24 12:02:39 2008 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
|
* transcode.c (rb_econv_open): return NULL on error.
|
||||||
|
|
||||||
Sun Aug 24 11:40:38 2008 Tanaka Akira <akr@fsij.org>
|
Sun Aug 24 11:40:38 2008 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* include/ruby/encoding.h (rb_econv_open_exc): declared.
|
* include/ruby/encoding.h (rb_econv_open_exc): declared.
|
||||||
|
|
|
@ -780,7 +780,7 @@ rb_econv_open(const char *from, const char *to, int flags)
|
||||||
ec = rb_econv_open_by_transcoder_entries(num_trans, entries);
|
ec = rb_econv_open_by_transcoder_entries(num_trans, entries);
|
||||||
xfree(entries);
|
xfree(entries);
|
||||||
if (!ec)
|
if (!ec)
|
||||||
rb_raise(rb_eArgError, "encoding conversion not supported (from %s to %s)", from, to);
|
return NULL;
|
||||||
|
|
||||||
ec->flags = flags;
|
ec->flags = flags;
|
||||||
ec->source_encoding_name = from;
|
ec->source_encoding_name = from;
|
||||||
|
|
Loading…
Reference in a new issue