summaryrefslogtreecommitdiff
path: root/ACE/ace/OS_NS_dirent.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-05-24 14:44:39 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-05-24 14:44:39 +0000
commita91f4b7fa79b5287e927371a5c13898cb83f52d2 (patch)
treed0f02948c8da8fc058deb500b4d373809a2e2df3 /ACE/ace/OS_NS_dirent.cpp
parent8fa93ca7849bd72ab98029dfa5189dbcc951a578 (diff)
downloadATCD-a91f4b7fa79b5287e927371a5c13898cb83f52d2.tar.gz
Mon May 24 14:42:57 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_dirent.cpp: Small code improvements to closedir * tests/FlReactor_Test.cpp: Small changes
Diffstat (limited to 'ACE/ace/OS_NS_dirent.cpp')
-rw-r--r--ACE/ace/OS_NS_dirent.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp
index e0326a7ff6a..9db405613f8 100644
--- a/ACE/ace/OS_NS_dirent.cpp
+++ b/ACE/ace/OS_NS_dirent.cpp
@@ -21,9 +21,11 @@ ACE_OS::closedir_emulation (ACE_DIR *d)
{
#if defined (ACE_WIN32)
if (d->current_handle_ != INVALID_HANDLE_VALUE)
- ::FindClose (d->current_handle_);
+ {
+ ::FindClose (d->current_handle_);
+ d->current_handle_ = INVALID_HANDLE_VALUE;
+ }
- d->current_handle_ = INVALID_HANDLE_VALUE;
d->started_reading_ = 0;
if (d->dirent_ != 0)
{
@@ -174,7 +176,6 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname,
ACE_DIRENT **vector = 0;
ACE_DIRENT *dp = 0;
int arena_size = 0;
-
int nfiles = 0;
int fail = 0;