зеркало из https://github.com/github/ruby.git
* marshal.c (w_object, r_bytes0, marshal_load): suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
a67f1a9534
Коммит
fff5de3bd4
|
@ -637,7 +637,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;
|
||||
|
@ -1110,7 +1110,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;
|
||||
}
|
||||
|
@ -1759,14 +1759,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");
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#define RUBY_VERSION "1.9.3"
|
||||
#define RUBY_RELEASE_DATE "2010-06-27"
|
||||
#define RUBY_RELEASE_DATE "2010-06-28"
|
||||
#define RUBY_PATCHLEVEL -1
|
||||
#define RUBY_BRANCH_NAME "trunk"
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
|||
#define RUBY_VERSION_TEENY 1
|
||||
#define RUBY_RELEASE_YEAR 2010
|
||||
#define RUBY_RELEASE_MONTH 6
|
||||
#define RUBY_RELEASE_DAY 27
|
||||
#define RUBY_RELEASE_DAY 28
|
||||
|
||||
#include "ruby/version.h"
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче