diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-21 20:19:51 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-21 20:19:51 +0000 |
commit | 2f4951f01e62f6c30cdeb31a60b6cafae326047d (patch) | |
tree | 2302e9c0294d83b079902a0d9ab3604881d7c013 /ext | |
parent | 80eba73d6a28901b6c198b3c59488ca4fdbc1d71 (diff) | |
download | ruby-2f4951f01e62f6c30cdeb31a60b6cafae326047d.tar.gz |
* ext/stringio/stringio.c (strio_init): separate from strio_initialize
to share with strio_reopen properly. [ruby-Bugs-13919]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/stringio/stringio.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index c4960f68a4..34e0a1dd19 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -30,6 +30,7 @@ struct StringIO { static void strio_mark _((struct StringIO *)); static void strio_free _((struct StringIO *)); +static void strio_init(int, VALUE *, struct StringIO *); #define IS_STRIO(obj) (RDATA(obj)->dmark == (RUBY_DATA_FUNC)strio_mark) #define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg)) @@ -146,13 +147,21 @@ static VALUE strio_initialize(int argc, VALUE *argv, VALUE self) { struct StringIO *ptr = check_strio(self); - VALUE string, mode; - int trunc = Qfalse; if (!ptr) { DATA_PTR(self) = ptr = strio_alloc(); } rb_call_super(0, 0); + strio_init(argc, argv, ptr); + return self; +} + +static void +strio_init(int argc, VALUE *argv, struct StringIO *ptr) +{ + VALUE string, mode; + int trunc = Qfalse; + switch (rb_scan_args(argc, argv, "02", &string, &mode)) { case 2: if (FIXNUM_P(mode)) { @@ -184,7 +193,6 @@ strio_initialize(int argc, VALUE *argv, VALUE self) break; } ptr->string = string; - return self; } static VALUE @@ -490,7 +498,8 @@ strio_reopen(int argc, VALUE *argv, VALUE self) if (argc == 1 && TYPE(*argv) != T_STRING) { return strio_copy(self, *argv); } - return strio_initialize(argc, argv, self); + strio_init(argc, argv, StringIO(self)); + return self; } /* |