mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 16:44:49 +01:00
Merge commit '2537a2c376658ea64bfaf37bc9738b76d71a787b'
This commit is contained in:
commit
a2974f3759
@ -5062,7 +5062,7 @@ cmdprint(struct LOC_exec *LINK)
|
|||||||
/* fputs(n.UU.sval, stdout); */
|
/* fputs(n.UU.sval, stdout); */
|
||||||
output_msg(PhreeqcPtr->sformatf("%s ", n.UU.sval));
|
output_msg(PhreeqcPtr->sformatf("%s ", n.UU.sval));
|
||||||
}
|
}
|
||||||
PhreeqcPtr->PHRQ_free(n.UU.sval);
|
n.UU.sval = (char*)PhreeqcPtr->free_check_null(n.UU.sval);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
/* printf("%s ", numtostr(STR1, n.UU.val)); */
|
/* printf("%s ", numtostr(STR1, n.UU.val)); */
|
||||||
@ -5146,7 +5146,7 @@ cmdpunch(struct LOC_exec *LINK)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PhreeqcPtr->PHRQ_free(n.UU.sval);
|
n.UU.sval = (char*)PhreeqcPtr->free_check_null(n.UU.sval);
|
||||||
}
|
}
|
||||||
else if (!temp_high_precision)
|
else if (!temp_high_precision)
|
||||||
{
|
{
|
||||||
@ -5159,6 +5159,10 @@ cmdpunch(struct LOC_exec *LINK)
|
|||||||
punch_tab = true;
|
punch_tab = true;
|
||||||
++PhreeqcPtr->n_user_punch_index;
|
++PhreeqcPtr->n_user_punch_index;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
n.UU.sval = (char*)PhreeqcPtr->free_check_null(n.UU.sval);
|
||||||
|
}
|
||||||
this->skip_punch = false;
|
this->skip_punch = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user