Program: gdcm
Module: $RCSfile: gdcmArgMgr.cxx,v $
Language: C++
- Date: $Date: 2006/01/26 15:52:56 $
- Version: $Revision: 1.17 $
+ Date: $Date: 2007/05/23 14:18:07 $
+ Version: $Revision: 1.24 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <ctype.h>
#include <string.h> // For strlen
+// No strcasecmp in WIN32 world, but stricmp
+// http://www.opengroup.org/onlinepubs/007908799/xsh/strcasecmp.html
+#ifdef _WIN32
+#define strcasecmp stricmp
+#endif
+
#include <string.h> // For strtok and strlen
#include <stdlib.h> // For strtol and strtod
#include "gdcmArgMgr.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-------------------------------------------------------------------------
// Constructor / Destructor
}
/* Set labels to upper-case (labels are not case sensitive ) *********/
+ //char *secu;
for ( i=0; i<ArgCount; i++)
+ {
+ //secu = ArgLab[i];
ArgLab[i] = Majuscule ( ArgLab[i] ) ;
+ //free (secu); //we still need it in the caller pgm.
+ }
/* Standard arguments are managed by ArgStdArgs **********************/
ArgStdArgs();
trouve = ( strcmp( ArgLab[i], temp )==0 ) ;
if ( trouve )
{
+ free (temp);
ArgUsed[i] = true ;
for ( int j=1; j<i; j++)
{
ArgUsed[j] = i ;
}
return i ;
- }
+ }
}
+ free (temp);
return 0 ;
}
* \brief Search for the first not yet used label
* @return Pointer to the char array holding the first non used label
*/
-char *ArgMgr::ArgMgrUnused ( )
+const char *ArgMgr::ArgMgrUnused ( )
{
int i ;
for ( i=ArgCount-1; i>0; i-- )
*/
int ArgMgr::ArgMgrPrintUnusedLabels ()
{
- char *label;
+ const char *label;
int i=0;
while ( (label=ArgMgrUnused())!=0 )
{
* @param param char. array that defines the parameter
* @return Entier correspondant au rang dans la liste de labels
*/
-int ArgMgr::ArgMgrSave ( char *param )
+int ArgMgr::ArgMgrSave ( const char *param )
{
static int deja = 0;
FILE *fd;
* @param val number of default value
* @return int : range of value amongst the values list
*/
-int ArgMgr::ArgMgrGetLabel (const char *param, char *liste, int val )
+int ArgMgr::ArgMgrGetLabel (const char *param, const char *liste, int val )
{
char *lab;
const char *vallab;
* @param liste character Chain describing the various values.
* Labels are separated by '\\'.
* No case sensitive.
+ * WARNING this will be changed (not const)
* @param usage Usage program (displayed if label not found)
* @return int : range of value amongst the values list
*/
* Valeur retournee . : false if OK. *
* true if KO. *
**************************************************************************/
-int ArgMgr::FiltreLong ( char *arg )
+int ArgMgr::FiltreLong ( const char *arg )
{
int n = 0 ;
while ( (n++<ARG_LONG_MAX) && (*(arg++) != '\0') ) ;
| Role : parameter File name
|
+------------------------------------------------------------------------*/
-int ArgMgr::ArgLoadFromFile ( char *filename )
+int ArgMgr::ArgLoadFromFile ( const char *filename )
{
int nbl = 0;
char param[ARG_LONG_MAX+1];