From a401c209a120a44b355e53180a5a9a8d1a3cdc4c Mon Sep 17 00:00:00 2001
From: jpr <jpr>
Date: Fri, 28 Sep 2007 11:03:52 +0000
Subject: [PATCH] I don't like warnings!

---
 src/gdcmArgMgr.cxx | 19 ++++++++++++-------
 src/gdcmArgMgr.h   |  8 ++++----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/gdcmArgMgr.cxx b/src/gdcmArgMgr.cxx
index 6ec26367..cd15136d 100644
--- a/src/gdcmArgMgr.cxx
+++ b/src/gdcmArgMgr.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:07 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2007/09/28 11:03:53 $
+  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
@@ -43,12 +43,13 @@ namespace GDCM_NAME_SPACE
  * @param argv  pointers array on the arguments passed to main()  
  */
  ArgMgr::ArgMgr(int argc, char **argv)
+ : ArgUsed(NULL), ArgLab(NULL), ArgStr(NULL), ArgCount(0), Appel(NULL)
  {
    int i;
-   int nblettre;
-   ArgUsed = NULL;
-   Appel   = NULL;
-  
+   int nblettre;   
+   ArgLab = new char *[ARGMAXCOUNT];
+   ArgStr = new char *[ARGMAXCOUNT];
+   
    /* Read the parameters of the command line *************************/
    for ( ArgCount=0, nblettre=1 , i=0; i<argc; i++) 
    {
@@ -94,7 +95,8 @@ namespace GDCM_NAME_SPACE
       char * egaloufin = ArgLab[i] ;
       while ( (*egaloufin != '\0') && (*egaloufin != '=') ) 
          egaloufin ++ ;
-      if ( *egaloufin ) *(egaloufin++) = '\0';
+      if ( *egaloufin )
+          *(egaloufin++) = '\0';
       ArgStr[i]= egaloufin;
    }
 
@@ -119,10 +121,13 @@ ArgMgr::~ArgMgr()
    for(int i=0;i<ArgCount;i++)
       if ( ArgLab[i] )
          free(ArgLab[i]);
+   delete ArgLab;   
+   delete ArgStr;  
    if ( ArgUsed )
       free(ArgUsed);
    if ( Appel )
       free(Appel);
+ 
 }
  
 /**
diff --git a/src/gdcmArgMgr.h b/src/gdcmArgMgr.h
index f31ff390..6d84ca54 100644
--- a/src/gdcmArgMgr.h
+++ b/src/gdcmArgMgr.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:07 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2007/09/28 11:03:52 $
+  Version:   $Revision: 1.14 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -102,8 +102,8 @@ private :
    const char *ArgParamOut;    // Output File Name for param
 
    char *ArgUsed;              // Used Arguments 
-   char *ArgLab[ARGMAXCOUNT];  // Arguments Labels
-   char *ArgStr[ARGMAXCOUNT];  // Arguments 'strings'
+   char **ArgLab; //[ARGMAXCOUNT];  // Arguments Labels
+   char **ArgStr; //[ARGMAXCOUNT];  // Arguments 'strings'
    int   ArgCount;             // Number of arguments passed 
    char *Appel;                
 };
-- 
2.45.0