naruse	2008-08-22 11:32:44 +0900 (Fri, 22 Aug 2008)

  New Revision: 18769

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18769

  Log:
    * dir.c (dir_enc_str_new): renamed from dir_enc_str.
    
    * dir.c (dir_read): use dir_enc_str_new.
    
    * dir.c (dir_each): ditto.
    
    * dir.c (push_pattern): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/dir.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18768)
+++ ChangeLog	(revision 18769)
@@ -1,3 +1,13 @@
+Fri Aug 22 11:30:38 2008  NARUSE, Yui  <naruse@r...>
+
+	* dir.c (dir_enc_str_new): renamed from dir_enc_str.
+
+	* dir.c (dir_read): use dir_enc_str_new.
+
+	* dir.c (dir_each): ditto.
+
+	* dir.c (push_pattern): ditto.
+
 Fri Aug 22 11:29:10 2008  NARUSE, Yui  <naruse@r...>
 
 	* common.mk: remove config.h dependency.
Index: dir.c
===================================================================
--- dir.c	(revision 18768)
+++ dir.c	(revision 18769)
@@ -424,10 +424,11 @@
 } while (0)
 
 static VALUE
-dir_enc_str(VALUE str, struct dir_data *dirp)
+dir_enc_str_new(const char *p, long len, rb_encoding *enc)
 {
-    rb_enc_associate(str, dirp->extenc);
-    return str;
+    VALUE path = rb_tainted_str_new(p, len);
+    rb_enc_associate(path, enc);
+    return path;
 }
 
 /*
@@ -490,7 +491,7 @@
     errno = 0;
     dp = readdir(dirp->dir);
     if (dp) {
-	return dir_enc_str(rb_tainted_str_new(dp->d_name, NAMLEN(dp)), dirp);
+	return dir_enc_str_new(dp->d_name, NAMLEN(dp), dirp->extenc);
     }
     else if (errno == 0) {	/* end of stream */
 	return Qnil;
@@ -528,7 +529,7 @@
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
     for (dp = readdir(dirp->dir); dp != NULL; dp = readdir(dirp->dir)) {
-	rb_yield(dir_enc_str(rb_tainted_str_new(dp->d_name, NAMLEN(dp)), dirp));
+	rb_yield(dir_enc_str_new(dp->d_name, NAMLEN(dp), dirp->extenc));
 	if (dirp->dir == NULL) dir_closed();
     }
     return dir;
@@ -1432,9 +1433,7 @@
 static void
 push_pattern(const char *path, VALUE ary, void *enc)
 {
-    VALUE vpath = rb_tainted_str_new2(path);
-    rb_enc_associate(vpath, enc);
-    rb_ary_push(ary, vpath);
+    rb_ary_push(ary, dir_enc_str_new(path, strlen(path), enc));
 }
 
 static int

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