From: jpr <jpr>
Date: Sun, 28 Aug 2005 16:56:05 +0000 (+0000)
Subject: Bug fix in command line argument manager
X-Git-Tag: Version1.2.bp~195
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2d3b99ded7b569f8624ae85b99126821098a429a;p=gdcm.git

Bug fix in command line argument manager
---

diff --git a/src/gdcmArgMgr.cxx b/src/gdcmArgMgr.cxx
index 6564bce4..79ef553c 100644
--- a/src/gdcmArgMgr.cxx
+++ b/src/gdcmArgMgr.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/30 18:18:44 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2005/08/28 16:56:05 $
+  Version:   $Revision: 1.13 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -117,10 +117,10 @@ ArgMgr::~ArgMgr()
 /**
  * \brief  checks if a parameter exists in the command line
  * @param param  label name
- * @return   false if label is not found
- *           true  if label is not found
+ * @return   0 if label is not found
+ *           else, returns the number of the spot it was found last time.
  */
-bool ArgMgr::ArgMgrDefined( const char *param )
+int ArgMgr::ArgMgrDefined( const char *param )
 {
   int i, trouve ;
   char *temp;
@@ -134,12 +134,12 @@ bool ArgMgr::ArgMgrDefined( const char *param )
       for ( int j=1; j<i; j++)
       {                     
          if ( (!ArgUsed[j])&&(!strcmp(ArgLab[i],ArgLab[j])) )
-            ArgUsed[j] = true ;
+            ArgUsed[j] = i ;
       }
-      return true ;
+      return i ;
     }
   }
-  return false ;
+  return 0 ;
 }
 
 /**
diff --git a/src/gdcmArgMgr.h b/src/gdcmArgMgr.h
index fa24597f..18b6454c 100644
--- a/src/gdcmArgMgr.h
+++ b/src/gdcmArgMgr.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/30 18:18:44 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2005/08/28 16:56:05 $
+  Version:   $Revision: 1.10 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -54,7 +54,7 @@ public:
    ArgMgr(int argc, char **argv);
    ~ArgMgr();
 
-   bool   ArgMgrDefined           (const char *param);  // Checks if Param is defined
+   int    ArgMgrDefined           (const char *param);  // Checks if Param is defined
    char  *ArgMgrValue             (const char *param);  // Returns Param value 
    char  *ArgMgrUnused            (void);               // Returns a never used arg.
    int    ArgMgrSave              (char *);             // Save of parameters out