diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-02 08:25:00 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-02 08:25:00 +0000 |
commit | 69eaabdca83558c3b85d8606606dc3975a106dac (patch) | |
tree | cb4ae14994972651eed5db1489218c1a64663990 /error.c | |
parent | e2bf8b48f01edcdd38d6194fb1b59706d17f6576 (diff) | |
download | ruby-69eaabdca83558c3b85d8606606dc3975a106dac.tar.gz ruby-69eaabdca83558c3b85d8606606dc3975a106dac.tar.xz ruby-69eaabdca83558c3b85d8606606dc3975a106dac.zip |
* time.c (time_load): restore instance variables (if any) before
loading from marshaled data.
* time.c (time_mdump): new marshal dumper. _dump is still
available for compatibility.
* time.c (time_mload): new marshal loader.
* marshal.c (w_object): preserve instance variables for objects
with marshal_dump.
* marshal.c (r_object0): restore instance variables before calling
marshal_load.
* error.c (rb_warn_m): always return nil.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r-- | error.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -166,10 +166,11 @@ static VALUE rb_warn_m(self, mesg) VALUE self, mesg; { - if (NIL_P(ruby_verbose)) return; - rb_io_write(rb_stderr, mesg); - rb_io_write(rb_stderr, rb_default_rs); - return mesg; + if (!NIL_P(ruby_verbose)) { + rb_io_write(rb_stderr, mesg); + rb_io_write(rb_stderr, rb_default_rs); + } + return Qnil; } void |