From 694035eb35d7dc52ae58d8306cad2c2d6b0bf240 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 3 Jun 2012 07:34:03 +0000 Subject: use rb_marshal_{dump,load} * marshal.c: revert r35879 "now marshal_{load|dump} are external." * complex.c (nucomp_marshal__{dump,load}): should use rb_marshal_{dump,load}. * rational.c (nurat_marshal__{dump,load}): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ complex.c | 12 ++++-------- marshal.c | 4 ++-- rational.c | 11 +++-------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02feb61366..ff16faf31f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Jun 3 16:33:58 2012 Nobuyoshi Nakada + + * marshal.c: revert r35879 "now marshal_{load|dump} are external." + + * complex.c (nucomp_marshal__{dump,load}): should use rb_marshal_{dump,load}. + + * rational.c (nurat_marshal__{dump,load}): ditto. + Sun Jun 3 14:13:58 2012 Tadayoshi Funaba * ext/date/date_core.c: checks whether the object is frozen or not. diff --git a/complex.c b/complex.c index 3b644b2319..c5303c10d9 100644 --- a/complex.c +++ b/complex.c @@ -1255,15 +1255,13 @@ nucomp_marshal_dump(VALUE self) } #ifdef MARSHAL_OLD_STYLE -VALUE marshal_dump(int, VALUE *); - /* :nodoc: */ static VALUE nucomp_marshal__dump(VALUE self, VALUE limit) { - VALUE argv[1]; - argv[0] = nucomp_marshal_dump(self); - return marshal_dump(1, argv); + VALUE arg; + arg = nucomp_marshal_dump(self); + return rb_marshal_dump(arg, Qnil); } #endif @@ -1286,13 +1284,11 @@ nucomp_marshal_load(VALUE self, VALUE a) } #ifdef MARSHAL_OLD_STYLE -VALUE marshal_load(int, VALUE *); - /* :nodoc: */ static VALUE nucomp_marshal__load(VALUE klass, VALUE s) { - return nucomp_marshal_load(nucomp_s_alloc(klass), marshal_load(1, &s)); + return nucomp_marshal_load(nucomp_s_alloc(klass), rb_marshal_load(s)); } #endif diff --git a/marshal.c b/marshal.c index 7745cb9ccd..046729d364 100644 --- a/marshal.c +++ b/marshal.c @@ -899,7 +899,7 @@ clear_dump_arg(struct dump_arg *arg) * ThreadGroup, Continuation * * objects which defines singleton methods */ -VALUE +static VALUE marshal_dump(int argc, VALUE *argv) { VALUE obj, port, a1, a2; @@ -1752,7 +1752,7 @@ clear_load_arg(struct load_arg *arg) * to_str. If proc is specified, it will be passed each object as it * is deserialized. */ -VALUE +static VALUE marshal_load(int argc, VALUE *argv) { VALUE port, proc; diff --git a/rational.c b/rational.c index 258f901d39..248fcdada0 100644 --- a/rational.c +++ b/rational.c @@ -1601,15 +1601,12 @@ nurat_marshal_dump(VALUE self) } #ifdef MARSHAL_OLD_STYLE -VALUE marshal_dump(int, VALUE *); - /* :nodoc: */ static VALUE nurat_marshal__dump(VALUE self, VALUE limit) { - VALUE argv[1]; - argv[0] = nurat_marshal_dump(self); - return marshal_dump(1, argv); + VALUE arg = nurat_marshal_dump(self); + return rb_marshal_dump(arg, Qnil); } #endif @@ -1636,13 +1633,11 @@ nurat_marshal_load(VALUE self, VALUE a) } #ifdef MARSHAL_OLD_STYLE -VALUE marshal_load(int, VALUE *); - /* :nodoc: */ static VALUE nurat_marshal__load(VALUE klass, VALUE s) { - return nurat_marshal_load(nurat_s_alloc(klass), marshal_load(1, &s)); + return nurat_marshal_load(nurat_s_alloc(klass), rb_marshal_load(s)); } #endif -- cgit v1.2.3