X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=615d0b4deced7612782941982df26cb9c0c80d02;hb=01ecb467c35ed8257eabd5fd189eb645b3f2215b;hp=c04df60f64d1d895d7d37a790051d010d241f90b;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index c04df60f..615d0b4d 100644
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:45 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2005/01/12 22:09:55 $
+  Version:   $Revision: 1.32 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,22 +20,18 @@
 #include "gdcmUtil.h"
 
 #include <iostream>
-#include <algorithm>
 
-#if defined(_MSC_VER) || defined (__CYGWIN__)
-   #include <windows.h> 
 #ifdef _MSC_VER
+   #include <windows.h> 
    #include <direct.h>
-#endif //_MSC_VER
 #else
    #include <dirent.h>   
-   #include <unistd.h>
-   #include <sys/stat.h>
    #include <sys/types.h>
+   #include <sys/stat.h>
 #endif
+
 namespace gdcm 
 {
-
 // Constructor / Destructor
 /**
  * \ingroup DirList
@@ -43,11 +39,11 @@ namespace gdcm
  * @param  dirName root directory name
  * @param  recursive whether we want to explore recursively or not 
  */
-DirList::DirList(std::string dirName, bool recursive)
+DirList::DirList(std::string const &dirName, bool recursive)
 {
-   name = dirName;
-   Util::NormalizePath(name);
-   Explore(name, recursive);
+   DirName = dirName;
+   Util::NormalizePath(DirName);
+   Explore(DirName, recursive);
 }
 
 /**
@@ -68,9 +64,9 @@ DirList::~DirList()
  * \brief   Get the directory name
  * @return the directory name 
  */
-std::string DirList::GetDirName()
+std::string const &DirList::GetDirName() const
 {
-   return name;
+   return DirName;
 }
 
 //-----------------------------------------------------------------------------
@@ -80,18 +76,17 @@ std::string DirList::GetDirName()
 // Private
 
 /**
- * \ingroup DirList
  * \brief   Explore a directory with possibility of recursion
  *          return number of files read
- * @param  dirName directory to explore
+ * @param  dirpath   directory to explore
  * @param  recursive whether we want recursion or not
  */
-int DirList::Explore(std::string dirName, bool recursive)
+int DirList::Explore(std::string const &dirpath, bool recursive)
 {
    int numberOfFiles = 0;
    std::string fileName;
-   Util::NormalizePath(dirName);
-#if defined(_MSC_VER) || (__CYGWIN__)
+   std::string dirName = Util::NormalizePath(dirpath);
+#ifdef _MSC_VER
    WIN32_FIND_DATA fileData; 
    HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
    int found = true;
@@ -113,7 +108,7 @@ int DirList::Explore(std::string dirName, bool recursive)
          numberOfFiles++;
       }
 
-      found = FindNextFile(hFile,&fileData);
+      found = FindNextFile(hFile, &fileData);
    }
 
 #else
@@ -132,7 +127,7 @@ int DirList::Explore(std::string dirName, bool recursive)
    // bility  of  your  programs.
 
    struct stat buf;
-   dirent* d = 0;
+   dirent *d = 0;
    for (d = readdir(dir); d; d = readdir(dir))
    {
       fileName = dirName + d->d_name;