BUG: Remove demangle code this was seg faulting on some linux gcc 3.3.2 machine

[gdcm.git] / src / gdcmDirList.cxx

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 3d8dd2ea155641ae8eb6789a18aede2ce557f93c..d4d0c2db649b3e269fce44ef13a4ff99b5ade0d1 100644 (file)
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/30 16:15:40 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2004/10/27 23:03:07 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -34,25 +34,27 @@
    #include <sys/types.h>
 #endif
 
+namespace gdcm 
+{
 // Constructor / Destructor
 /**
- * \ingroup gdcmDirList
+ * \ingroup DirList
  * \brief Constructor  
  * @param  dirName root directory name
  * @param  recursive whether we want to explore recursively or not 
  */
-gdcmDirList::gdcmDirList(std::string dirName, bool recursive)
+DirList::DirList(std::string const & dirName, bool recursive)
 {
    name = dirName;
-   NormalizePath(name);
+   Util::NormalizePath(name);
    Explore(name, recursive);
 }
 
 /**
- * \ingroup gdcmDirList
+ * \ingroup DirList
  * \brief  Destructor
  */
-gdcmDirList::~gdcmDirList()
+DirList::~DirList()
 {
 }
 
@@ -62,11 +64,11 @@ gdcmDirList::~gdcmDirList()
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \ingroup gdcmDirList
+ * \ingroup DirList
  * \brief   Get the directory name
  * @return the directory name 
  */
-std::string gdcmDirList::GetDirName()
+std::string const & DirList::GetDirName() const
 {
    return name;
 }
@@ -78,18 +80,18 @@ std::string gdcmDirList::GetDirName()
 // Private
 
 /**
- * \ingroup gdcmDirList
+ * \ingroup DirList
  * \brief   Explore a directory with possibility of recursion
  *          return number of files read
  * @param  dirName directory to explore
  * @param  recursive whether we want recursion or not
  */
-int gdcmDirList::Explore(std::string dirName, bool recursive)
+int DirList::Explore(std::string const & dirpath, bool recursive)
 {
    int numberOfFiles = 0;
    std::string fileName;
-   NormalizePath(dirName);
-#if defined(_MSC_VER) || (__CYGWIN__)
+   std::string dirName = Util::NormalizePath(dirpath);
+#if defined(_MSC_VER) || defined(__CYGWIN__)
    WIN32_FIND_DATA fileData; 
    HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
    int found = true;
@@ -158,5 +160,6 @@ int gdcmDirList::Explore(std::string dirName, bool recursive)
 
   return numberOfFiles;
 }
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------