diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-03 19:49:11 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-03 19:49:11 +0000 |
| commit | 15f2a7e97c5af2887c5127342092a8d9a3a4e11a (patch) | |
| tree | 001d729053431b6a4c44a20452d3fb79fb8da486 /win32 | |
| parent | c98501e706717a41db2465fa020f39dea44d1c5b (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_7@21294 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 498c4b306c..6f29a15f97 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1635,15 +1635,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; } // @@ -1668,6 +1660,7 @@ void rb_w32_rewinddir(DIR *dirp) { dirp->curr = dirp->start; + dirp->loc = 0; } // |