summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-19 03:22:03 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-19 03:22:03 +0000
commit12cbb588193ac5148b6421fc8953c817acb0ae9f (patch)
treea8a501830a01ce87cb652e9feb39797921ef43bc /object.c
parentc511d26f6ae87f16956fe40fe5a5cfb6b66811b2 (diff)
* test/ruby/test_sprintf.rb: fix ML ref. [ruby-core:32848]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
-rw-r--r--object.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/object.c b/object.c
index 5ad5680d88..7eecf49bfc 100644
--- a/object.c
+++ b/object.c
@@ -712,9 +712,7 @@ rb_obj_taint(VALUE obj)
{
rb_secure(4);
if (!OBJ_TAINTED(obj)) {
- if (OBJ_FROZEN(obj)) {
- rb_error_frozen("object");
- }
+ rb_check_frozen(obj);
OBJ_TAINT(obj);
}
return obj;
@@ -733,9 +731,7 @@ rb_obj_untaint(VALUE obj)
{
rb_secure(3);
if (OBJ_TAINTED(obj)) {
- if (OBJ_FROZEN(obj)) {
- rb_error_frozen("object");
- }
+ rb_check_frozen(obj);
FL_UNSET(obj, FL_TAINT);
}
return obj;
@@ -768,9 +764,7 @@ rb_obj_untrust(VALUE obj)
{
rb_secure(4);
if (!OBJ_UNTRUSTED(obj)) {
- if (OBJ_FROZEN(obj)) {
- rb_error_frozen("object");
- }
+ rb_check_frozen(obj);
OBJ_UNTRUST(obj);
}
return obj;
@@ -789,9 +783,7 @@ rb_obj_trust(VALUE obj)
{
rb_secure(3);
if (OBJ_UNTRUSTED(obj)) {
- if (OBJ_FROZEN(obj)) {
- rb_error_frozen("object");
- }
+ rb_check_frozen(obj);
FL_UNSET(obj, FL_UNTRUSTED);
}
return obj;