diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-01 05:45:59 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-01 05:45:59 +0000 |
| commit | 10df2f885279875e09511c975bba5cd61a33aa58 (patch) | |
| tree | bed616d0b35f3e24c4ac46d35b257be446f41fc5 | |
| parent | ad5a5f940df5e84c17ea820aacdc15eb7bb55aed (diff) | |
* 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@18301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | win32/win32.c | 11 |
2 files changed, 9 insertions, 9 deletions
@@ -1,3 +1,10 @@ +Fri Aug 1 14:45:56 2008 Nobuyoshi Nakada <[email protected]> + + * win32/win32.c (rb_w32_telldir): just returns loc. + + * win32/win32.c (rb_w32_rewinddir): needs to intialize loc. + [ruby-core:18041] + Thu Jul 31 12:23:53 2008 Nobuyoshi Nakada <[email protected]> * pack.c (pack_unpack): upper half of hexdigits has never been used. 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; } // |