Offset set to 0 in the constructor to prevent any further missprinting

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index c2e169ddb1563bb2f5fcb9288b6ff0c38340e395..4c053864a287ec7e4d79a998f0b6334c7d8aec58 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,10 +1,27 @@
-// gdcmUtil.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/07/17 22:47:01 $
+  Version:   $Revision: 1.47 $
+                                                                                
+  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.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmUtil.h"
 #include "gdcmDebug.h"
 #include <stdio.h>
 #include <ctype.h>   // For isspace
 #include <string.h>  // CLEANME: could this be only string ? Related to Win32 ?
+#include <iostream>
 
 /**
  * \ingroup Globals
@@ -46,7 +63,7 @@ void Tokenize (const std::string& str,
 std::string CreateCleanString(std::string s) {
    std::string str=s;
 
-   for(int i=0;i<str.size();i++)
+   for(unsigned int i=0;i<str.size();i++)
    {
       if(!isprint(str[i]))
          str[i]='.';
@@ -57,7 +74,7 @@ std::string CreateCleanString(std::string s) {
          if(s[str.size()-1]==0)
             str[str.size()-1]=' ';
 
-   return(str);
+   return str;
 }
 
 /**
@@ -85,13 +102,17 @@ void NormalizePath(std::string &name)
  */
 std::string GetPath(std::string &fullName)
 {
-   int pos1=fullName.rfind("/");
-   int pos2=fullName.rfind("\\");
-   if(pos1>pos2)
+   int pos1 = fullName.rfind("/");
+   int pos2 = fullName.rfind("\\");
+   if( pos1 > pos2)
+   {
       fullName.resize(pos1);
+   }
    else
+   {
       fullName.resize(pos2);
-   return(fullName);
+   }
+   return fullName;
 }
 
 /**
@@ -106,7 +127,7 @@ std::string GetName(std::string &fullName)
   if (a == '/' || a == '\\') {
      fin--;
   }
-  int deb;
+  int deb = 0;
   for (int i=fin;i!=0;i--) {
      if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\')  
         break;
@@ -117,5 +138,5 @@ std::string GetName(std::string &fullName)
   for (int j=deb;j<fin+1;j++)
     lastName=lastName+fullName.c_str()[j];
 
-  return(lastName);
+  return lastName;
 }