diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-01-30 13:44:16 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-01-30 13:44:16 +0000 |
| commit | ca986c6bf8d1b9227cab7dd8eb91f43632b80b0b (patch) | |
| tree | 231826badbaeb91bbceadd460892b08804c7dda1 | |
| parent | 5c25715276e745736cddb8385a239e0d0fa3bd95 (diff) | |
| download | cygnal-ca986c6bf8d1b9227cab7dd8eb91f43632b80b0b.tar.gz cygnal-ca986c6bf8d1b9227cab7dd8eb91f43632b80b0b.tar.bz2 cygnal-ca986c6bf8d1b9227cab7dd8eb91f43632b80b0b.zip | |
* fhandler_disk_file.cc (fhandler_disk_file::rewinddir): Simplify
conditional.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index e9253598a..596b05ab3 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2006-01-30 Corinna Vinschen <corinna@vinschen.de> + * fhandler_disk_file.cc (fhandler_disk_file::rewinddir): Simplify + conditional. + +2006-01-30 Corinna Vinschen <corinna@vinschen.de> + * fhandler_disk_file.cc (d_cachepos): Rename from d_pos to distinct clearly from __d_position. Change throughout. (fhandler_disk_file::rewinddir): Reset readdir cache on NT. diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index ff4547630..bc6fc3b31 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1767,7 +1767,7 @@ fhandler_disk_file::rewinddir (DIR *dir) { if (wincap.is_winnt ()) d_cachepos (dir) = 0; - if (!wincap.is_winnt () && dir->__handle != INVALID_HANDLE_VALUE) + else if (dir->__handle != INVALID_HANDLE_VALUE) { if (dir->__handle) FindClose (dir->__handle); |