diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-03 19:48:32 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-03 19:48:32 +0000 |
| commit | 1d9b5929b7ef3d5f2017a800e61240a4c9f181b4 (patch) | |
| tree | 760f320dae37f2452ba65de8f4c8b6e3e5bca1a2 /win32 | |
| parent | 08ba6b3f36c513c249d743a9fd6848d5b032ab14 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/win32/win32.c b/win32/win32.c index 3c16e57df1..c3b8612cac 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1640,15 +1640,7 @@ rb_w32_readdir(DIR *dirp) 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; } // @@ -1673,6 +1665,7 @@ void rb_w32_rewinddir(DIR *dirp) { dirp->curr = dirp->start; + dirp->loc = 0; } // |