diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-10 19:22:11 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-10 19:22:11 +0000 |
commit | cb434b4a80ef26aab670b41ec2b6204916c38ce9 (patch) | |
tree | 199d484808d00456dd74ca09e3e5cf64ef1a2231 | |
parent | c26d21bf71dc2aef9de9f92d0aba2f098df85986 (diff) | |
download | ruby-cb434b4a80ef26aab670b41ec2b6204916c38ce9.tar.gz |
* signal.c (sig_trap): suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | signal.c | 4 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Wed Mar 11 04:22:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * signal.c (sig_trap): suppress warnings. + Tue Mar 10 20:07:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/Makefile.sub (WARNFLAGS): uses -wd4996 instead of @@ -935,7 +935,7 @@ sig_trap(int argc, VALUE *argv) struct trap_arg arg; rb_secure(2); - if (argc == 0 || argc > 2) { + if (argc < 1 || argc > 2) { rb_raise(rb_eArgError, "wrong number of arguments -- trap(sig, cmd)/trap(sig){...}"); } @@ -944,7 +944,7 @@ sig_trap(int argc, VALUE *argv) arg.cmd = rb_block_proc(); arg.func = sighandler; } - else if (argc == 2) { + else { arg.cmd = argv[1]; arg.func = trap_handler(&arg.cmd, arg.sig); } @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-03-10" +#define RUBY_RELEASE_DATE "2009-03-11" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 11 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |