DCQ:prepare 2.0.0

diff --git a/build_configure b/build_configure
index 758502e19cca50fd12b868bf51cd2b8683f1368e..6ae0a342f136baea6ad767f94ac36a54178e9c4f 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -147,10 +147,10 @@ find_in . configure.in_tmp2
 
 # _CS_gbo_100204 Mise à jour du filtre pour prise en compte des
 # restrictions imposées par les versions récente de autoconf.
-sed -e '/^     \.\/salome_adm/d' \
-    -e '/configure.in/d'         \
-    -e '/^     \.\/adm_local/d'  \
-    -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
+    sed -e '/^ \.\/salome_adm/d' \
+       -e '/configure.in/d'      \
+       -e '/^  \.\/adm_local/d'  \
+       -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
 
 echo  "])" >> configure.in_tmp1
 

diff --git a/src/MEDMEM/MEDMEM_MedMeshDriver.cxx b/src/MEDMEM/MEDMEM_MedMeshDriver.cxx
index 021f9afa816d8bbf04c75a31cd12af6907c8e4f0..1aa73c0e3cb41089c7921da93355b1b19491d486 100644 (file)
--- a/src/MEDMEM/MEDMEM_MedMeshDriver.cxx
+++ b/src/MEDMEM/MEDMEM_MedMeshDriver.cxx
@@ -1294,7 +1294,7 @@ int  MED_MESH_RDONLY_DRIVER::getFAMILY()
        throw MEDEXCEPTION("MED_MESH_RDONLY_DRIVER::getFAMILY() : NumberOfGroups" );
       
       int FamilyIdentifier ;
-      string FamilyName(MED_TAILLE_NOM,'\0 ');
+      string FamilyName(MED_TAILLE_NOM,'\0');
       int *  AttributesIdentifier = new int[NumberOfAttributes] ;
       int *  AttributesValues     = new int[NumberOfAttributes] ;
       string AttributesDescription(MED_TAILLE_DESC*NumberOfAttributes,' ') ;

diff --git a/src/MEDMEM_I/MEDMEM_Med_i.cxx b/src/MEDMEM_I/MEDMEM_Med_i.cxx
index 0f925ea36b33a866fdf9998f861afade314997fd..c2f48b4c85862bbcc6f624350938671bc2beec10 100644 (file)
--- a/src/MEDMEM_I/MEDMEM_Med_i.cxx
+++ b/src/MEDMEM_I/MEDMEM_Med_i.cxx
@@ -1232,7 +1232,7 @@ void MED_i::addInStudy(SALOMEDS::Study_ptr myStudy, SALOME_MED::MED_ptr myIor,
 
        SCRUTE(fileNameShort);
 
-       int lenName = 21 + strlen(fileNameShort.c_str());
+       int lenName = 21 + strlen(fileNameShort.c_str()) + 1;
        medObjName = new char[lenName];
        medObjName = strcpy(medObjName,"MED_OBJECT_FROM_FILE_");
        medObjName = strcat(medObjName,fileNameShort.c_str());

diff --git a/src/MEDMEM_I/MEDMEM_Support_i.cxx b/src/MEDMEM_I/MEDMEM_Support_i.cxx
index 2906fe99fe29588720cddf723465c40c8b33183f..8858a600c691401d5f74f20209248245a59356e4 100644 (file)
--- a/src/MEDMEM_I/MEDMEM_Support_i.cxx
+++ b/src/MEDMEM_I/MEDMEM_Support_i.cxx
@@ -558,7 +558,7 @@ void SUPPORT_i::addInStudy (SALOMEDS::Study_ptr myStudy, SALOME_MED::SUPPORT_ptr
   MESSAGE("Add a support Object under /Med/MESH/MESHNAME");
 
   char * medsupfatherName;
-  int lenName = 15 + strlen(meshName.c_str());
+  int lenName = 15 + strlen(meshName.c_str()) + 1;
   medsupfatherName = new char[lenName];
   medsupfatherName = strcpy(medsupfatherName,"MEDSUPPORTS_OF_");
   medsupfatherName = strcat(medsupfatherName,meshNameStudy.c_str());

diff --git a/src/MEDMEM_SWIG/libMEDMEM_Swig.i b/src/MEDMEM_SWIG/libMEDMEM_Swig.i
index 405eba3c1050966f3be48089af30cb3a3a9d2321..70638cf1793d6b19eb9683aa28bee30954b5bafa 100644 (file)
--- a/src/MEDMEM_SWIG/libMEDMEM_Swig.i
+++ b/src/MEDMEM_SWIG/libMEDMEM_Swig.i
@@ -1811,8 +1811,8 @@ public :
     char * getMeshName()
       {
        string tmp_str = self->getMeshName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -1858,8 +1858,8 @@ public :
     char * getMeshName()
       {
        string tmp_str = self->getMeshName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -1906,8 +1906,8 @@ public :
     char * getMeshName()
       {
        string tmp_str = self->getMeshName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -1957,8 +1957,8 @@ public :
     char * getMeshName()
       {
        string tmp_str = self->getMeshName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2004,8 +2004,8 @@ public :
     char * getMeshName()
       {
        string tmp_str = self->getMeshName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2052,8 +2052,8 @@ public :
     char * getMeshName()
       {
        string tmp_str = self->getMeshName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2100,8 +2100,8 @@ class MED_MESH_RDONLY_DRIVER
     char * getMeshName()
       {
        string tmp_str = self->getMeshName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2143,8 +2143,8 @@ class MED_MESH_WRONLY_DRIVER
     char * getMeshName()
       {
        string tmp_str = self->getMeshName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2188,8 +2188,8 @@ class MED_MESH_RDWR_DRIVER : public virtual MED_MESH_RDONLY_DRIVER,
     char * getMeshName()
       {
        string tmp_str = self->getMeshName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2236,8 +2236,8 @@ public:
     char * getFieldName()
       {
        string tmp_str = self->getFieldName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2280,8 +2280,8 @@ public:
     char * getFieldName()
       {
        string tmp_str = self->getFieldName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2324,8 +2324,8 @@ public:
     char * getFieldName()
       {
        string tmp_str = self->getFieldName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2372,8 +2372,8 @@ public:
     char * getFieldName()
       {
        string tmp_str = self->getFieldName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2416,8 +2416,8 @@ public:
     char * getFieldName()
       {
        string tmp_str = self->getFieldName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }
@@ -2460,8 +2460,8 @@ public:
     char * getFieldName()
       {
        string tmp_str = self->getFieldName();
-       char * tmp = new char[strlen(tmp_str.c_str())];
-       strcat(tmp,tmp_str.c_str());
+       char * tmp = new char[strlen(tmp_str.c_str()) + 1];
+       strcpy(tmp,tmp_str.c_str());
        return tmp;
       }
   }

diff --git a/src/MedClient/test/test1/Makefile.in b/src/MedClient/test/test1/Makefile.in
index 560a739e3c1182f129270026d720723637c82738..d77c9eb87b8e9de666eae23eaba53f766e7ddf52 100644 (file)
--- a/src/MedClient/test/test1/Makefile.in
+++ b/src/MedClient/test/test1/Makefile.in
@@ -64,7 +64,8 @@ install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%)
 $(EXPORT_PYSCRIPTS:%=install-%): install-%: %
        $(INSTALL_PROGRAM) $< $(bindir)/.
 
-@MODULE@
+# _CS_gbo_240504 Il s'agit d'un répertoire feuille
+@CONCLUDE@
 
 bin: pyscripts