* include/ruby/ruby.h: $SAFE=2 is now obsolete.

* dir.c, ext/fiddle/handle.c, ext/socket/basicsocket.c, file.c
  gc.c, io.c, process.c, safe.c, signal.c, win32/file.c:
  removed code for $SAFE=2
* test/erb/test_erb.rb, test/fiddle/test_handle.rb
  test/ruby/test_env.rb: removed tests for $SAFE=2.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 5 deletions

diff --git a/safe.c b/safe.c
index 73d861d760..c1eca672a0 100644
--- a/safe.c
+++ b/safe.c
@@ -24,12 +24,12 @@
 
 #undef rb_secure
 #undef rb_set_safe_level
-#undef ruby_safe_level_3_warning
+#undef ruby_safe_level_2_warning
 
 int
-ruby_safe_level_3_warning(void)
+ruby_safe_level_2_warning(void)
 {
-    return 3;
+    return 2;
 }
 
 int
@@ -51,7 +51,7 @@ rb_set_safe_level(int level)
 
     if (level > th->safe_level) {
 	if (level > SAFE_LEVEL_MAX) {
-	    rb_raise(rb_eArgError, "$SAFE=3 and 4 is obsolete");
+	    rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete");
 	}
 	th->safe_level = level;
     }
@@ -75,7 +75,7 @@ safe_setter(VALUE val)
 		 th->safe_level, level);
     }
     if (level > SAFE_LEVEL_MAX) {
-	rb_raise(rb_eArgError, "$SAFE=3 and 4 is obsolete");
+	rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete");
     }
     th->safe_level = level;
 }