nobu	2007-12-19 23:57:39 +0900 (Wed, 19 Dec 2007)

  New Revision: 14337

  Modified files:
    trunk/ChangeLog
    trunk/dir.c

  Log:
    * dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed
      is not needed.  [ruby-dev:32640]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14337&r2=14336
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/dir.c?r1=14337&r2=14336

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14336)
+++ ChangeLog	(revision 14337)
@@ -1,3 +1,8 @@
+Wed Dec 19 23:57:37 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed
+	  is not needed.  [ruby-dev:32640]
+
 Wed Dec 19 22:59:52 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* string.c (str_sublen): adjust position if position is not at the
Index: dir.c
===================================================================
--- dir.c	(revision 14336)
+++ dir.c	(revision 14337)
@@ -268,7 +268,7 @@
 	    const char *t;
 	    if (ISEND(s))
 		RETURN(FNM_NOMATCH);
-	    if (t = bracket(p + 1, s, flags)) {
+	    if ((t = bracket(p + 1, s, flags)) != 0) {
 		p = t;
 		Inc(s);
 		continue;
@@ -465,7 +465,7 @@
 {
     struct dir_data *dirp;
 
-    GetDIR(dir, dirp);
+    Data_Get_Struct(dir, struct dir_data, dirp);
     if (dirp->path) {
 	char *c = rb_obj_classname(dir);
 	int len = strlen(c) + strlen(dirp->path) + 4;
@@ -490,7 +490,7 @@
 {
     struct dir_data *dirp;
 
-    GetDIR(dir, dirp);
+    Data_Get_Struct(dir, struct dir_data, dirp);
     if (!dirp->path) return Qnil;
     return rb_str_new2(dirp->path);
 }
@@ -581,7 +581,7 @@
     struct dir_data *dirp;
     long pos;
 
-    GetDIR(dir, dirp);
+    Data_Get_Struct(dir, struct dir_data, dirp);
     pos = telldir(dirp->dir);
     return rb_int2inum(pos);
 #else
@@ -976,7 +976,7 @@
     register const char *p = s;
     register char c;
 
-    while (c = *p++) {
+    while ((c = *p++) != 0) {
 	switch (c) {
 	  case '*':
 	  case '?':
@@ -1009,7 +1009,7 @@
     register char c;
     int open = 0;
 
-    while (c = *p++) {
+    while ((c = *p++) != 0) {
 	switch (c) {
 	  case '[':
 	    open = 1;

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