From 8294bb95e07911b8c6f359f841d1a2b70eb50e18 Mon Sep 17 00:00:00 2001 From: nri Date: Mon, 19 Jul 2004 16:10:17 +0000 Subject: [PATCH] DCQ:prepare 2.0.0 --- build_configure | 8 ++-- src/MEDMEM/MEDMEM_MedMeshDriver.cxx | 2 +- src/MEDMEM_I/MEDMEM_Med_i.cxx | 2 +- src/MEDMEM_I/MEDMEM_Support_i.cxx | 2 +- src/MEDMEM_SWIG/libMEDMEM_Swig.i | 60 ++++++++++++++-------------- src/MedClient/test/test1/Makefile.in | 3 +- 6 files changed, 39 insertions(+), 38 deletions(-) diff --git a/build_configure b/build_configure index 758502e19..6ae0a342f 100755 --- 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 021f9afa8..1aa73c0e3 100644 --- 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 0f925ea36..c2f48b4c8 100644 --- 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 2906fe99f..8858a600c 100644 --- 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 405eba3c1..70638cf17 100644 --- 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 560a739e3..d77c9eb87 100644 --- 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 -- 2.39.2