summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--win32/win32.c11
2 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a7f8df0b9..8175c969ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;
}
//