Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/medcoupling
[tools/medcoupling.git]
/
src
/
MEDLoader
/
MEDLoaderBase.cxx
diff --git
a/src/MEDLoader/MEDLoaderBase.cxx
b/src/MEDLoader/MEDLoaderBase.cxx
index 86bf9c2270f36b30ca95044df908af71609ffb1b..b2f8fd78a5e53b3cf84b2559bff8811449dbf451 100644
(file)
--- a/
src/MEDLoader/MEDLoaderBase.cxx
+++ b/
src/MEDLoader/MEDLoaderBase.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D
+// Copyright (C) 2007-201
9
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-89,7
+89,7
@@
std::string MEDLoaderBase::buildUnionUnit(const char *name, int nameLgth, const
{
std::string ret(buildStringFromFortran(name,nameLgth));
std::string unitCpp(buildStringFromFortran(unit,unitLgth));
{
std::string ret(buildStringFromFortran(name,nameLgth));
std::string unitCpp(buildStringFromFortran(unit,unitLgth));
- if(unitCpp[0]=='\0')
+ if(unitCpp
.empty() || unitCpp
[0]=='\0')
return ret;
ret+=" [";
ret+=unitCpp;
return ret;
ret+=" [";
ret+=unitCpp;
@@
-130,7
+130,7
@@
void MEDLoaderBase::strip(std::string& s)
/*!
* This method operates a safe copy from 'src' to 'dest' by checking the size of 'src' before trying to copy.
/*!
* This method operates a safe copy from 'src' to 'dest' by checking the size of 'src' before trying to copy.
- * If size of 'src' string is higher than 'maxLgth' the behaviour is depend
a
nt from 'behaviour' parameter.
+ * If size of 'src' string is higher than 'maxLgth' the behaviour is depend
e
nt from 'behaviour' parameter.
* If 'behaviour' equals 0 an exception is thrown. If 'behaviour' equals 1 an attempt of zipping of string will be done
* ( see zipString to have more details).
*/
* If 'behaviour' equals 0 an exception is thrown. If 'behaviour' equals 1 an attempt of zipping of string will be done
* ( see zipString to have more details).
*/
@@
-177,7
+177,8
@@
void MEDLoaderBase::safeStrCpy2(const char *src, int maxLgth, char *dest, int be
return ;
}
}
return ;
}
}
- int n=strlen(src);
+ int n(strlen(src));
+ std::fill(dest,dest+maxLgth,' ');
strncpy(dest,src,n);
}
strncpy(dest,src,n);
}