* eval.c (search_required): use RSTRING_PTR and RSTRING_STR.

* object.c (nil_plus): ditto.

* ext/dl/cptr.c (rb_dlptr_s_to_ptr): ditto.

* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 3 insertions, 3 deletions

diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
index fe83c7adf6..b947ef27ef 100644
--- a/ext/dl/cptr.c
+++ b/ext/dl/cptr.c
@@ -430,7 +430,7 @@ rb_dlptr_s_to_ptr(VALUE self, VALUE val)
     }
     else if( rb_obj_is_kind_of(val, rb_cString) == Qtrue ){
         char *ptr = StringValuePtr(val);
-        return rb_dlptr_new(ptr, RSTRING(val)->len, NULL); 
+        return rb_dlptr_new(ptr, RSTRING_LEN(val), NULL); 
     }
     else if( rb_respond_to(val, id_to_ptr) ){
 	VALUE vptr = rb_funcall(val, id_to_ptr, 0);
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
index c024a955e4..aa9366f901 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -241,7 +241,7 @@ ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
     ext = X509V3_EXT_nconf_nid(conf, ctx, nid, RSTRING_PTR(valstr));
 #else
     if (!empty_lhash) empty_lhash = lh_new(NULL, NULL);
-    ext = X509V3_EXT_conf_nid(empty_lhash, ctx, nid, RSTRING(valstr)->ptr);
+    ext = X509V3_EXT_conf_nid(empty_lhash, ctx, nid, RSTRING_PTR(valstr));
 #endif
     if (!ext){
 	ossl_raise(eX509ExtError, "%s = %s",
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
index 40d91931d3..d3704f867b 100644
--- a/ext/syck/emitter.c
+++ b/ext/syck/emitter.c
@@ -98,7 +98,7 @@ syck_base64dec( char *s, long len )
         }
     }
     *end = '\0';
-    /*RSTRING(buf)->len = ptr - RSTRING(buf)->ptr;*/
+    /*RSTRING_LEN(buf) = ptr - RSTRING_PTR(buf);*/
     return ptr;
 }