3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 259ca743e2..e597b8c8db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/signal.c b/signal.c
index b00686d1a5..7c9dda465d 100644
--- a/signal.c
+++ b/signal.c
@@ -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);
     }
diff --git a/version.h b/version.h
index de40ddcac1..e1da5e85e8 100644
--- a/version.h
+++ b/version.h
@@ -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[];