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 | cfea253c0ffad7fccf6f9211310f9012428e4bb4 (patch) | |
tree | 895b7a06a48eb6badef93bd668bbbb8ce59e602a /ext | |
parent | 43207747c1d77610da9824ecc0c4365b1874e445 (diff) |
* 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/branches/ruby_1_8@13482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/stringio/stringio.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 1ae1172be2..4fd8526fa5 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -136,6 +136,7 @@ check_modifiable(ptr) static VALUE strio_s_allocate _((VALUE)); static VALUE strio_s_open _((int, VALUE *, VALUE)); +static void strio_init _((int, VALUE *, struct StringIO *)); static VALUE strio_initialize _((int, VALUE *, VALUE)); static VALUE strio_finalize _((VALUE)); static VALUE strio_self _((VALUE)); @@ -217,13 +218,24 @@ strio_initialize(argc, argv, self) 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(argc, argv, ptr) + 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)) { @@ -255,7 +267,6 @@ strio_initialize(argc, argv, self) break; } ptr->string = string; - return self; } static VALUE @@ -570,7 +581,8 @@ strio_reopen(argc, argv, 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; } /* |