summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-24 08:14:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-24 08:14:05 +0000
commit23e8deaf0d4d44746d838489cc112c5fc4684402 (patch)
tree065095c5b77bd45e86df48f110dfe52d0d58630d /object.c
parent58d3597e743967bb4c486b108e7dcd0db5c3efca (diff)
* array.c, gc.c, hash.c, object.c, string.c, struct.c,
transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c: replace calls to rb_error_frozen() with rb_check_frozen(). a patch from Run Paint Run Run at [ruby-core:32014] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29583 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;