summaryrefslogtreecommitdiff
path: root/marshal.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-20 02:06:42 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-20 02:06:42 +0000
commite75c34c2e9f9e1c629cdab13c0c400494f49adb7 (patch)
tree7cc376d79d80b16b340be2219a6f80e69826a303 /marshal.c
parent0014687097c3c0ce8e728496ad7fa777372ea7fb (diff)
* gc.c (gc_sweep): loosen page free condition to avoid add_heap()
race condition. [ruby-dev:21633] * gc.c (gc_sweep): do not update malloc_limit when malloc_increase is smaller than malloc_limit. * ext/socket/socket.c (make_hostent): h_aliases may be NULL. (ruby-bugs PR#1195) * ext/socket/socket.c (sock_s_gethostbyaddr): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r--marshal.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/marshal.c b/marshal.c
index 76ab4ca..48d71ba 100644
--- a/marshal.c
+++ b/marshal.c
@@ -952,11 +952,11 @@ path2module(path)
}
static VALUE
-r_object0(arg, proc, ivp, extended)
+r_object0(arg, proc, ivp, extmod)
struct load_arg *arg;
VALUE proc;
int *ivp;
- VALUE extended;
+ VALUE extmod;
{
VALUE v = Qnil;
int type = r_byte(arg);
@@ -975,7 +975,7 @@ r_object0(arg, proc, ivp, extended)
{
int ivar = Qtrue;
- v = r_object0(arg, 0, &ivar, extended);
+ v = r_object0(arg, 0, &ivar, extmod);
if (ivar) r_ivar(v, arg);
}
break;
@@ -984,12 +984,12 @@ r_object0(arg, proc, ivp, extended)
{
VALUE m = path2module(r_unique(arg));
- if (NIL_P(extended)) extended = rb_ary_new2(0);
- rb_ary_push(extended, m);
+ if (NIL_P(extmod)) extmod = rb_ary_new2(0);
+ rb_ary_push(extmod, m);
- v = r_object0(arg, 0, 0, extended);
- while (RARRAY(extended)->len > 0) {
- m = rb_ary_pop(extended);
+ v = r_object0(arg, 0, 0, extmod);
+ while (RARRAY(extmod)->len > 0) {
+ m = rb_ary_pop(extmod);
rb_extend_object(v, m);
}
}
@@ -1002,7 +1002,7 @@ r_object0(arg, proc, ivp, extended)
if (FL_TEST(c, FL_SINGLETON)) {
rb_raise(rb_eTypeError, "singleton can't be loaded");
}
- v = r_object0(arg, 0, 0, extended);
+ v = r_object0(arg, 0, 0, extmod);
if (rb_special_const_p(v) || TYPE(v) == T_OBJECT || TYPE(v) == T_CLASS) {
format_error:
rb_raise(rb_eArgError, "dump format error (user class)");
@@ -1206,9 +1206,9 @@ r_object0(arg, proc, ivp, extended)
VALUE data;
v = rb_obj_alloc(klass);
- if (! NIL_P(extended)) {
- while (RARRAY(extended)->len > 0) {
- VALUE m = rb_ary_pop(extended);
+ if (! NIL_P(extmod)) {
+ while (RARRAY(extmod)->len > 0) {
+ VALUE m = rb_ary_pop(extmod);
rb_extend_object(v, m);
}
}
@@ -1258,7 +1258,7 @@ r_object0(arg, proc, ivp, extended)
"class %s needs to have instance method `_load_data'",
rb_class2name(klass));
}
- rb_funcall(v, s_load_data, 1, r_object0(arg, 0, 0, extended));
+ rb_funcall(v, s_load_data, 1, r_object0(arg, 0, 0, extmod));
}
break;