diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/stringio/stringio.c | 10 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 9 insertions, 9 deletions
@@ -1,3 +1,7 @@ +Mon Apr 6 10:47:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/stringio/stringio.c (strio_path): removed. [ruby-dev:38254] + Sun Apr 5 18:02:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/intern.h (rb_fd_resize): does nothing on Win32. diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index ce1d55fd4..bc605da2a 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -86,11 +86,11 @@ get_strio(VALUE self) } static VALUE -strio_substr(struct StringIO *ptr, int pos, int len) +strio_substr(struct StringIO *ptr, long pos, long len) { VALUE str = ptr->string; rb_encoding *enc = rb_enc_get(str); - int rlen = RSTRING_LEN(str) - pos; + long rlen = RSTRING_LEN(str) - pos; if (len > rlen) len = rlen; if (len < 0) len = 0; @@ -160,7 +160,7 @@ static void strio_init(int argc, VALUE *argv, struct StringIO *ptr) { VALUE string, mode; - int trunc = Qfalse; + int trunc = 0; switch (rb_scan_args(argc, argv, "02", &string, &mode)) { case 2: @@ -1185,9 +1185,6 @@ strio_sysread(int argc, VALUE *argv, VALUE self) #define strio_syswrite strio_write -/* call-seq: strio.path -> nil */ -#define strio_path strio_nil - /* * call-seq: * strio.isatty -> nil @@ -1325,7 +1322,6 @@ Init_stringio() rb_define_method(StringIO, "sync", strio_get_sync, 0); rb_define_method(StringIO, "sync=", strio_set_sync, 1); rb_define_method(StringIO, "tell", strio_tell, 0); - rb_define_method(StringIO, "path", strio_path, 0); rb_define_method(StringIO, "each", strio_each, -1); rb_define_method(StringIO, "each_line", strio_each, -1); @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-04-05" +#define RUBY_RELEASE_DATE "2009-04-06" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 6 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |