diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-01 11:59:50 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-01 11:59:50 +0000 |
commit | 982450e24fb275644664499cea197deae3f5722b (patch) | |
tree | 570def511e9e903cb7950efed9e94643d31b7729 | |
parent | a056546f0dfa9af3d358c70e2e66bbaf5b4fef8f (diff) |
* eval.c (rb_interrupt): trick to suppress GCC warning.
* sprintf.c (rb_str_format): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | eval.c | 3 | ||||
-rw-r--r-- | sprintf.c | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Jul 1 20:55:07 2008 URABE Shyouhei <shyouhei@ruby-lang.org> + + * eval.c (rb_interrupt): trick to suppress GCC warning. + + * sprintf.c (rb_str_format): ditto. + Tue Jul 1 20:44:36 2008 Koichi Sasada <ko1@atdot.net> * tool/instruction.rb: RubyVM is not module. @@ -435,8 +435,7 @@ rb_exc_fatal(VALUE mesg) void rb_interrupt(void) { - static const char fmt[1] = {'\0'}; - rb_raise(rb_eInterrupt, fmt); + rb_raise(rb_eInterrupt, "%s", ""); } static VALUE get_errinfo(void); @@ -979,8 +979,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) */ if (posarg >= 0 && nextarg < argc) { const char *mesg = "too many arguments for format string"; - if (RTEST(ruby_debug)) rb_raise(rb_eArgError, mesg); - if (RTEST(ruby_verbose)) rb_warn(mesg); + if (RTEST(ruby_debug)) rb_raise(rb_eArgError, "%s", mesg); + if (RTEST(ruby_verbose)) rb_warn("%s", mesg); } rb_str_resize(result, blen); |