diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/stringio/stringio.c | 20 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 24 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Sat Sep 22 05:19:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/stringio/stringio.c (strio_init): separate from strio_initialize + to share with strio_reopen properly. [ruby-Bugs-13919] + Fri Sep 21 15:46:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * process.c (struct rb_exec_arg): proc should be a VALUE. 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; } /* @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-09-21" +#define RUBY_RELEASE_DATE "2007-09-22" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070921 +#define RUBY_RELEASE_CODE 20070922 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 22 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |