X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=4422a0a8434590af61cde2e9517a52ce61e25a22;hb=2767ee200a3dc05314954bd8bb3a0427f3fcb7d9;hp=4504c3e68bb6166671796aa347f95724043bea09;hpb=a67d6fe2285819541448495fe13c7c057836e1f0;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index 4504c3e6..4422a0a8 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDirList.cxx,v $ Language: C++ - Date: $Date: 2005/01/14 22:44:39 $ - Version: $Revision: 1.36 $ + Date: $Date: 2005/01/18 08:01:41 $ + Version: $Revision: 1.39 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -34,7 +34,6 @@ namespace gdcm { // Constructor / Destructor /** - * \ingroup DirList * \brief Constructor * @param dirName root directory name * @param recursive whether we want to explore recursively or not @@ -46,7 +45,6 @@ DirList::DirList(std::string const &dirName, bool recursive) } /** - * \ingroup DirList * \brief Destructor */ DirList::~DirList() @@ -57,8 +55,8 @@ DirList::~DirList() // Public /** - * \ingroup DirList * \brief Print method + * @param os ostream to write to */ void DirList::Print(std::ostream &os) { @@ -93,7 +91,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive) fileName = fileData.cFileName; if( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) { - // Is the '.' and '..' usefull ? + // Need to check for . and .. to avoid infinite loop if( fileName != "." && fileName != ".." && recursive ) { numberOfFiles += Explore(dirName+fileName,recursive); @@ -105,7 +103,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive) numberOfFiles++; } } - if (hFile != INVALID_FILE_HANDLE) FindClose(hFile); + if (hFile != INVALID_HANDLE_VALUE) FindClose(hFile); #else // Real POSIX implementation: scandir is a BSD extension only, and doesn't @@ -119,7 +117,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive) // According to POSIX, the dirent structure contains a field char d_name[] // of unspecified size, with at most NAME_MAX characters preceding the - // terminating null character. Use of other fields will harm the porta- + // terminating null character. Use of other fields will harm the porta- // bility of your programs. struct stat buf;