summaryrefslogtreecommitdiff
path: root/marshal.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-27 15:13:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-27 15:13:25 +0000
commitc6d1886deff95a1ee92dab26102503a97f767589 (patch)
tree1bb397d232265cdfef92a5f03aa146b973afac2a /marshal.c
parent1f1937111dba69ee8deb6b0c23b11abddaeadbdc (diff)
* marshal.c (w_object, r_bytes0, marshal_load): suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r--marshal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/marshal.c b/marshal.c
index 7f87b42a62..73799413c5 100644
--- a/marshal.c
+++ b/marshal.c
@@ -640,7 +640,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
w_symbol(SYM2ID(obj), arg);
}
else {
- arg->infection |= FL_TEST(obj, MARSHAL_INFECTION);
+ arg->infection |= (int)FL_TEST(obj, MARSHAL_INFECTION);
if (rb_respond_to(obj, s_mdump)) {
volatile VALUE v;
@@ -1113,7 +1113,7 @@ r_bytes0(long len, struct load_arg *arg)
if (NIL_P(str)) goto too_short;
StringValue(str);
if (RSTRING_LEN(str) != len) goto too_short;
- arg->infection |= FL_TEST(str, MARSHAL_INFECTION);
+ arg->infection |= (int)FL_TEST(str, MARSHAL_INFECTION);
}
return str;
}
@@ -1762,14 +1762,14 @@ marshal_load(int argc, VALUE *argv)
rb_scan_args(argc, argv, "11", &port, &proc);
v = rb_check_string_type(port);
if (!NIL_P(v)) {
- infection = FL_TEST(port, MARSHAL_INFECTION); /* original taintedness */
+ infection = (int)FL_TEST(port, MARSHAL_INFECTION); /* original taintedness */
port = v;
}
else if (rb_respond_to(port, s_getbyte) && rb_respond_to(port, s_read)) {
if (rb_respond_to(port, s_binmode)) {
rb_funcall2(port, s_binmode, 0, 0);
}
- infection = FL_TAINT | FL_TEST(port, FL_UNTRUSTED);
+ infection = (int)(FL_TAINT | FL_TEST(port, FL_UNTRUSTED));
}
else {
rb_raise(rb_eTypeError, "instance of IO needed");