mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
Merge commit 'fb59ec8b19173e55422aef14fd2488cd1aca0680'
This commit is contained in:
commit
c32e6641b2
@ -3610,7 +3610,7 @@ factor(struct LOC_exec * LINK)
|
||||
|
||||
std::string std_num;
|
||||
{
|
||||
snprintf(token, sizeof(token), "%*.*e", length, width, nmbr);
|
||||
snprintf(token, max_length, "%*.*e", length, width, nmbr);
|
||||
std_num = token;
|
||||
}
|
||||
|
||||
@ -3653,7 +3653,7 @@ factor(struct LOC_exec * LINK)
|
||||
|
||||
std::string std_num;
|
||||
{
|
||||
snprintf(token, sizeof(token), "%*.*f", length, width, nmbr);
|
||||
snprintf(token, max_length, "%*.*f", length, width, nmbr);
|
||||
std_num = token;
|
||||
}
|
||||
|
||||
|
||||
@ -2097,7 +2097,6 @@ match_elts_in_species(const char *name, const char *mytemplate)
|
||||
* write out string
|
||||
*/
|
||||
token[0] = '\0';
|
||||
assert(MAX_LENGTH == sizeof(token1));
|
||||
for (i = 0; i < count_match_tokens; i++)
|
||||
{
|
||||
strcat(token, match_vector[i].first.c_str());
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user