ruby-changes:9753
From: shyouhei <ko1@a...>
Date: Sun, 4 Jan 2009 04:49:34 +0900 (JST)
Subject: [ruby-changes:9753] Ruby:r21294 (ruby_1_8_7): merge revision(s) 18301:
shyouhei 2009-01-04 04:49:11 +0900 (Sun, 04 Jan 2009) New Revision: 21294 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21294 Log: merge revision(s) 18301: * win32/win32.c (rb_w32_telldir): just returns loc. * win32/win32.c (rb_w32_rewinddir): needs to intialize loc. [ruby-core:18041] Modified files: branches/ruby_1_8_7/ChangeLog branches/ruby_1_8_7/version.h branches/ruby_1_8_7/win32/win32.c Index: ruby_1_8_7/ChangeLog =================================================================== --- ruby_1_8_7/ChangeLog (revision 21293) +++ ruby_1_8_7/ChangeLog (revision 21294) @@ -1,3 +1,10 @@ +Sun Jan 4 04:49:01 2009 Nobuyoshi Nakada <nobu@r...> + + * win32/win32.c (rb_w32_telldir): just returns loc. + + * win32/win32.c (rb_w32_rewinddir): needs to intialize loc. + [ruby-core:18041] + Sun Jan 4 04:45:26 2009 Nobuyoshi Nakada <nobu@r...> * win32/win32.c (rb_w32_select): recalc the rest of timeout for each Index: ruby_1_8_7/version.h =================================================================== --- ruby_1_8_7/version.h (revision 21293) +++ ruby_1_8_7/version.h (revision 21294) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-01-04" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090104 -#define RUBY_PATCHLEVEL 75 +#define RUBY_PATCHLEVEL 76 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_7/win32/win32.c =================================================================== --- ruby_1_8_7/win32/win32.c (revision 21293) +++ ruby_1_8_7/win32/win32.c (revision 21294) @@ -1635,15 +1635,7 @@ long rb_w32_telldir(DIR *dirp) { - long loc = 0; char *p = dirp->curr; - - rb_w32_rewinddir(dirp); - - while (p != dirp->curr) { - move_to_next_entry(dirp); loc++; - } - - return loc; + return dirp->loc; } // @@ -1668,6 +1660,7 @@ rb_w32_rewinddir(DIR *dirp) { dirp->curr = dirp->start; + dirp->loc = 0; } // -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/