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

* ext/win32ole/win32ole.c(ole_search_handler_method, rescue_callback,

Browse Source 
folerecord_inspect): use PRIsVALUE in rb_sprintf.

* ext/win32ole/win32ole_param.c(foleparam_inspect): ditto.

* ext/win32ole/win32ole_variable.c(folevariable_inspect): use
  PRIsVALUE in rb_sprintf, use rb_inspect.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2014-08-13 10:35:20 +00:00
parent 643551f0d3
commit 651b31e367
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Wed Aug 13 19:31:27 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c(ole_search_handler_method, rescue_callback,
folerecord_inspect): use PRIsVALUE in rb_sprintf.
* ext/win32ole/win32ole_param.c(foleparam_inspect): ditto.
* ext/win32ole/win32ole_variable.c(folevariable_inspect): use
PRIsVALUE in rb_sprintf, use rb_inspect.
Wed Aug 13 11:54:41 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Wed Aug 13 11:54:41 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/irb/completion.rb: reverted r47163. * lib/irb/completion.rb: reverted r47163.

10
ext/win32ole/win32ole.c
View File

@ -4389,7 +4389,7 @@ ole_search_handler_method(VALUE handler, VALUE ev, BOOL *is_default_handler)
VALUE mid; VALUE mid;
*is_default_handler = FALSE; *is_default_handler = FALSE;
mid = rb_to_id(rb_sprintf("on%s", StringValuePtr(ev))); mid = rb_to_id(rb_sprintf("on%"PRIsVALUE, ev));
if (rb_respond_to(handler, mid)) { if (rb_respond_to(handler, mid)) {
return mid; return mid;
} }
@ -4482,7 +4482,7 @@ rescue_callback(VALUE arg)
VALUE bt = rb_funcall(e, rb_intern("backtrace"), 0); VALUE bt = rb_funcall(e, rb_intern("backtrace"), 0);
VALUE msg = rb_funcall(e, rb_intern("message"), 0); VALUE msg = rb_funcall(e, rb_intern("message"), 0);
bt = rb_ary_entry(bt, 0); bt = rb_ary_entry(bt, 0);
error = rb_sprintf("%s: %s (%s)\n", StringValuePtr(bt), StringValuePtr(msg), rb_obj_classname(e)); error = rb_sprintf("%"PRIsVALUE": %"PRIsVALUE" (%s)\n", bt, msg, rb_obj_classname(e));
rb_write_error(StringValuePtr(error)); rb_write_error(StringValuePtr(error));
rb_backtrace(); rb_backtrace();
ruby_finalize(); ruby_finalize();
@ -6264,9 +6264,9 @@ folerecord_inspect(VALUE self)
tname = rb_inspect(tname); tname = rb_inspect(tname);
} }
field = rb_inspect(folerecord_to_h(self)); field = rb_inspect(folerecord_to_h(self));
return rb_sprintf("#<WIN32OLE_RECORD(%s) %s>", return rb_sprintf("#<WIN32OLE_RECORD(%"PRIsVALUE") %"PRIsVALUE">",
StringValuePtr(tname), tname,
StringValuePtr(field)); field);
} }
static void static void

2
ext/win32ole/win32ole_param.c
View File

@ -394,7 +394,7 @@ foleparam_inspect(VALUE self)
VALUE defval = foleparam_default(self); VALUE defval = foleparam_default(self);
if (defval != Qnil) { if (defval != Qnil) {
rb_str_cat2(detail, "="); rb_str_cat2(detail, "=");
rb_str_concat(detail, rb_funcall(defval, rb_intern("inspect"), 0)); rb_str_concat(detail, rb_inspect(defval));
} }
return make_inspect("WIN32OLE_PARAM", detail); return make_inspect("WIN32OLE_PARAM", detail);
} }

4
ext/win32ole/win32ole_variable.c
View File

@ -345,9 +345,9 @@ folevariable_varkind(VALUE self)
static VALUE static VALUE
folevariable_inspect(VALUE self) folevariable_inspect(VALUE self)
{ {
VALUE v = rb_funcall(folevariable_value(self), rb_intern("inspect"), 0); VALUE v = rb_inspect(folevariable_value(self));
VALUE n = folevariable_name(self); VALUE n = folevariable_name(self);
VALUE detail = rb_sprintf("%s=%s", StringValueCStr(n), StringValueCStr(v)); VALUE detail = rb_sprintf("%"PRIsVALUE"=%"PRIsVALUE, n, v);
return make_inspect("WIN32OLE_VARIABLE", detail); return make_inspect("WIN32OLE_VARIABLE", detail);
} }