(file) Return to DirWindows.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/DirWindows.cpp between version 1.12 and 1.14

version 1.12, 2003/11/18 22:15:45 version 1.14, 2004/10/01 10:21:16
Line 25 
Line 25 
 // //
 // Author: Mike Brasher (mbrasher@bmc.com) // Author: Mike Brasher (mbrasher@bmc.com)
 // //
 // Modified By:  // Modified By: Amit K Arora, IBM (amita@in.ibm.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include "Destroyer.h"  
 #include "Dir.h" #include "Dir.h"
 #include "InternalException.h" #include "InternalException.h"
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 #include <io.h>  
 #include <direct.h> #include <direct.h>
  
 struct DirRep  
 {  
     long file;  
     struct _finddata_t findData;  
 };  
  
 Dir::Dir(const String& path) Dir::Dir(const String& path)
 { {
     _rep = new DirRep;      _dirRep.file = _findfirst((path+"/*").getCString(), &_dirRep.findData);
     _rep->file = _findfirst((path+"/*").getCString(), &_rep->findData);  
  
     if (_rep->file == -1)      if (_dirRep.file == -1)
     {     {
         _more = false;         _more = false;
         delete _rep;  
         throw CannotOpenDirectory(path);         throw CannotOpenDirectory(path);
     }     }
     else     else
Line 61 
Line 52 
  
 Dir::~Dir() Dir::~Dir()
 { {
     if (_rep->file != -1)      if (_dirRep.file != -1)
         _findclose(_rep->file);          _findclose(_dirRep.file);
  
     delete _rep;  
 } }
  
 const char* Dir::getName() const const char* Dir::getName() const
 { {
     return _rep->findData.name;      return _dirRep.findData.name;
 } }
  
 void Dir::next() void Dir::next()
Line 77 
Line 67 
     if (!_more)     if (!_more)
         return;         return;
  
     _more = _findnext(_rep->file, &_rep->findData) == 0;      _more = _findnext(_dirRep.file, &_dirRep.findData) == 0;
 } }
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END


Legend:
Removed from v.1.12  
changed lines
  Added in v.1.14

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2