1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/iconv/iconv.c (warn_deprecated): show caller position.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-11 14:04:48 +00:00
parent a77d2ac5ba
commit a774aa4e79
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Nov 11 23:04:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (warn_deprecated): show caller position.
Thu Nov 11 23:03:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Nov 11 23:03:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_close): untie tied io before closing. * io.c (argf_close): untie tied io before closing.

26
ext/iconv/iconv.c
View File

@ -1179,12 +1179,36 @@ iconv_failure_inspect(VALUE self)
* * returns an error without setting errno properly * * returns an error without setting errno properly
*/ */
static void
warn_deprecated(void)
{
static const char message[] =
": iconv will be deprecated in the future, use String#encode instead.\n";
VALUE msg = Qnil, caller = rb_make_backtrace();
long i;
for (i = 1; i < RARRAY_LEN(caller); ++i) {
VALUE s = RARRAY_PTR(caller)[i];
if (strncmp(RSTRING_PTR(s), "<internal:", 10) != 0) {
msg = s;
break;
}
}
if (NIL_P(msg)) {
msg = rb_str_new_cstr(message + 2);
}
else {
rb_str_cat(msg, message, sizeof(message) - 1);
}
rb_io_puts(1, &msg, rb_stderr);
}
void void
Init_iconv(void) Init_iconv(void)
{ {
VALUE rb_cIconv = rb_define_class("Iconv", rb_cData); VALUE rb_cIconv = rb_define_class("Iconv", rb_cData);
rb_warn("iconv will be deprecated in the future, use String#encode instead."); warn_deprecated();
rb_define_alloc_func(rb_cIconv, iconv_s_allocate); rb_define_alloc_func(rb_cIconv, iconv_s_allocate);
rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, -1); rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, -1);
rb_define_singleton_method(rb_cIconv, "iconv", iconv_s_iconv, -1); rb_define_singleton_method(rb_cIconv, "iconv", iconv_s_iconv, -1);