ruby-changes:8094
From: suke <ko1@a...>
Date: Mon, 29 Sep 2008 20:02:11 +0900 (JST)
Subject: [ruby-changes:8094] Ruby:r19620 (trunk): * ext/win32ole/win32ole.c (rescue_callback): use rb_write_error
suke 2008-09-29 20:01:55 +0900 (Mon, 29 Sep 2008) New Revision: 19620 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19620 Log: * ext/win32ole/win32ole.c (rescue_callback): use rb_write_error instead of fprintf. Modified files: trunk/ChangeLog trunk/ext/win32ole/win32ole.c Index: ChangeLog =================================================================== --- ChangeLog (revision 19619) +++ ChangeLog (revision 19620) @@ -1,3 +1,8 @@ +Mon Sep 29 19:59:00 2008 Masaki Suketa <masaki.suketa@n...> + + * ext/win32ole/win32ole.c (rescue_callback): use rb_write_error + instead of fprintf. + Mon Sep 29 01:51:54 2008 Yusuke Endoh <mame@t...> * test/rdoc/test_rdoc_info_formatting.rb (teardown): delete tmpdir for Index: ext/win32ole/win32ole.c =================================================================== --- ext/win32ole/win32ole.c (revision 19619) +++ ext/win32ole/win32ole.c (revision 19620) @@ -118,7 +118,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "1.3.1" +#define WIN32OLE_VERSION "1.3.2" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -7542,11 +7542,13 @@ rescue_callback(VALUE arg) { + VALUE error; VALUE e = rb_errinfo(); VALUE bt = rb_funcall(e, rb_intern("backtrace"), 0); VALUE msg = rb_funcall(e, rb_intern("message"), 0); bt = rb_ary_entry(bt, 0); - fprintf(stdout, "%s: %s (%s)\n", StringValuePtr(bt), StringValuePtr(msg), rb_obj_classname(e)); + error = rb_sprintf("%s: %s (%s)\n", StringValuePtr(bt), StringValuePtr(msg), rb_obj_classname(e)); + rb_write_error(StringValuePtr(error)); rb_backtrace(); ruby_finalize(); exit(-1); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/