shyouhei	2007-09-07 15:14:19 +0900 (Fri, 07 Sep 2007)

  New Revision: 13377

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/ruby.c
    branches/ruby_1_8_5/version.h

  Log:
    * ruby.c (rubylib_mangled_path): eliminate RSTRING_PTR
      [ruby-dev:31679]
    
    * ruby.c (push_include_cygwin): ditto.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=13377&r2=13376
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ruby.c?r1=13377&r2=13376
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=13377&r2=13376

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 13376)
+++ ruby_1_8_5/ChangeLog	(revision 13377)
@@ -1,8 +1,19 @@
+Fri Sep  7 14:57:36 2007  URABE Shyouhei  <shyouhei@i...>
+
+	* ruby.c (rubylib_mangled_path): eliminate RSTRING_PTR
+	  [ruby-dev:31679]
+
+	* ruby.c(push_include_cygwin): ditto.
+
 Fri Sep  7 14:32:38 2007  Yukihiro Matsumoto  <matz@r...>
 
-	* array.c (rb_ary_fill): need integer overflow check.
-	  [ruby-dev:31738]
+	* array.c (rb_ary_subseq): need integer overflow check.
+	  [ruby-dev:31736]
 
+	* array.c (rb_ary_splice): ditto.  [ruby-dev:31737]
+
+	* array.c (rb_ary_fill): ditto.  [ruby-dev:31738]
+
 	* string.c (rb_str_splice): integer overflow for length.
 	  [ruby-dev:31739]
 
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 13376)
+++ ruby_1_8_5/version.h	(revision 13377)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-09-07"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20070907
-#define RUBY_PATCHLEVEL 108
+#define RUBY_PATCHLEVEL 109
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/ruby.c
===================================================================
--- ruby_1_8_5/ruby.c	(revision 13376)
+++ ruby_1_8_5/ruby.c	(revision 13377)
@@ -162,7 +162,7 @@
 	return rb_str_new(s, l);
     }
     ret = rb_str_new(0, l + newl - oldl);
-    ptr = RSTRING_PTR(ret);
+    ptr = RSTRING(ret)->ptr;
     memcpy(ptr, newp, newl);
     memcpy(ptr + newl, s + oldl, l - oldl);
     ptr[l + newl - oldl] = 0;
@@ -218,11 +218,11 @@
 	if (*s) {
 	    if (!buf) {
 		buf = rb_str_new(p, len);
-		p = RSTRING_PTR(buf);
+		p = RSTRING(buf)->ptr;
 	    }
 	    else {
 		rb_str_resize(buf, len);
-		p = strncpy(RSTRING_PTR(buf), p, len);
+		p = strncpy(RSTRING(buf)->ptr, p, len);
 	    }
 	}
 	if (cygwin_conv_to_posix_path(p, rubylib) == 0)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml