[macruby-changes] [2281] MacRuby/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Aug 11 12:03:22 PDT 2009
Revision: 2281
http://trac.macosforge.org/projects/ruby/changeset/2281
Author: lsansonetti at apple.com
Date: 2009-08-11 12:03:22 -0700 (Tue, 11 Aug 2009)
Log Message:
-----------
fixed indentation
Modified Paths:
--------------
MacRuby/trunk/array.c
MacRuby/trunk/object.c
Modified: MacRuby/trunk/array.c
===================================================================
--- MacRuby/trunk/array.c 2009-08-11 19:02:56 UTC (rev 2280)
+++ MacRuby/trunk/array.c 2009-08-11 19:03:22 UTC (rev 2281)
@@ -1567,11 +1567,10 @@
if (OBJ_TAINTED(ary)) {
OBJ_TAINT(dup);
}
-
- if (OBJ_UNTRUSTED(ary))
- {
+
+ if (OBJ_UNTRUSTED(ary)) {
OBJ_UNTRUST(dup);
- }
+ }
return dup;
}
Modified: MacRuby/trunk/object.c
===================================================================
--- MacRuby/trunk/object.c 2009-08-11 19:02:56 UTC (rev 2280)
+++ MacRuby/trunk/object.c 2009-08-11 19:03:22 UTC (rev 2281)
@@ -909,37 +909,37 @@
static VALUE
rb_obj_untrusted_imp(VALUE obj, SEL sel)
{
- if (!SPECIAL_CONST_P(obj) && NATIVE(obj)) {
- switch (TYPE(obj)) {
- case T_ARRAY:
- if (*(VALUE *)obj != rb_cCFArray) {
- return RBASIC(obj)->flags & FL_UNTRUSTED ? Qtrue : Qfalse;
- }
-// fall through
- case T_STRING:
- if (*(VALUE *)obj == rb_cByteString) {
- return rb_objc_flag_check((const void *)obj, FL_UNTRUSTED)
- ? Qtrue : Qfalse;
- }
-// fall through
- case T_HASH:
+ if (!SPECIAL_CONST_P(obj) && NATIVE(obj)) {
+ switch (TYPE(obj)) {
+ case T_ARRAY:
+ if (*(VALUE *)obj != rb_cCFArray) {
+ return RBASIC(obj)->flags & FL_UNTRUSTED ? Qtrue : Qfalse;
+ }
+ // fall through
+ case T_STRING:
+ if (*(VALUE *)obj == rb_cByteString) {
+ return rb_objc_flag_check((const void *)obj, FL_UNTRUSTED)
+ ? Qtrue : Qfalse;
+ }
+ // fall through
+ case T_HASH:
#ifdef __LP64__
- return (RCLASS_RC_FLAGS(obj) & FL_UNTRUSTED) == FL_UNTRUSTED ? Qtrue : Qfalse;
+ return (RCLASS_RC_FLAGS(obj) & FL_UNTRUSTED) == FL_UNTRUSTED ? Qtrue : Qfalse;
#endif
- default:
- return rb_objc_flag_check((const void *)obj, FL_UNTRUSTED) ? Qtrue : Qfalse;
- }
+ default:
+ return rb_objc_flag_check((const void *)obj, FL_UNTRUSTED) ? Qtrue : Qfalse;
}
- if (FL_TEST(obj, FL_UNTRUSTED)) {
- return Qtrue;
- }
- return Qfalse;
+ }
+ if (FL_TEST(obj, FL_UNTRUSTED)) {
+ return Qtrue;
+ }
+ return Qfalse;
}
VALUE
rb_obj_untrusted(VALUE obj)
{
- return rb_obj_untrusted_imp(obj, 0);
+ return rb_obj_untrusted_imp(obj, 0);
}
static VALUE
@@ -982,7 +982,7 @@
VALUE
rb_obj_trust(VALUE obj)
{
- return rb_obj_trust_imp(obj, 0);
+ return rb_obj_trust_imp(obj, 0);
}
static VALUE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090811/2667c2d3/attachment.html>
More information about the macruby-changes
mailing list