Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Changed sprintf to snprintf #47

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Changed sprintf to snprintf #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/mainsubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ initial_solutions(int print)
}
if (print == TRUE)
{
sprintf(token, "Initial solution %d.\t%.350s",
snprintf(token, sizeof(token), "Initial solution %d.\t%.350s",
solution_ref.Get_n_user(), solution_ref.Get_description().c_str());
dup_print(token, FALSE);
}
Expand Down Expand Up @@ -521,7 +521,7 @@ initial_exchangers(int print)
}
if (print == TRUE)
{
sprintf(token, "Exchange %d.\t%.350s",
snprintf(token, sizeof(token), "Exchange %d.\t%.350s",
exchange_ptr->Get_n_user(), exchange_ptr->Get_description().c_str());
dup_print(token, FALSE);
}
Expand Down Expand Up @@ -613,7 +613,7 @@ initial_gas_phases(int print)
}
if (print == TRUE)
{
sprintf(token, "Gas_Phase %d.\t%.350s",
snprintf(token, sizeof(token), "Gas_Phase %d.\t%.350s",
gas_phase_ptr->Get_n_user(), gas_phase_ptr->Get_description().c_str());
dup_print(token, FALSE);
}
Expand Down Expand Up @@ -664,7 +664,7 @@ initial_gas_phases(int print)
}
if (fabs(gas_phase_ptr->Get_total_p() - use.Get_solution_ptr()->Get_patm()) > 5)
{
sprintf(token,
snprintf(token, sizeof(token),
"WARNING: While initializing gas phase composition by equilibrating:\n%s (%.2f atm) %s (%.2f atm).\n%s.",
" Gas phase pressure",
(double) gas_phase_ptr->Get_total_p(),
Expand Down Expand Up @@ -835,7 +835,7 @@ reactions(void)
for (reaction_step = 1; reaction_step <= count_steps; reaction_step++)
{
overall_iterations = 0;
sprintf(token, "Reaction step %d.", reaction_step);
snprintf(token, sizeof(token), "Reaction step %d.", reaction_step);
if (reaction_step > 1 && incremental_reactions == FALSE)
{
copy_use(-2);
Expand Down Expand Up @@ -941,7 +941,7 @@ saver(void)

if (save.solution == TRUE)
{
sprintf(token, "Solution after simulation %d.", simulation);
snprintf(token, sizeof(token), "Solution after simulation %d.", simulation);
description_x = token;
n = save.n_solution_user;
xsolution_save(n);
Expand Down Expand Up @@ -1032,7 +1032,7 @@ xexchange_save(int n_user)
temp_exchange.Set_n_user(n_user);
temp_exchange.Set_n_user_end(n_user);
temp_exchange.Set_new_def(false);
sprintf(token, "Exchange assemblage after simulation %d.", simulation);
snprintf(token, sizeof(token), "Exchange assemblage after simulation %d.", simulation);
temp_exchange.Set_description(token);
temp_exchange.Set_solution_equilibria(false);
temp_exchange.Set_n_solution(-999);
Expand Down Expand Up @@ -1115,7 +1115,7 @@ xgas_save(int n_user)
*/
temp_gas_phase.Set_n_user(n_user);
temp_gas_phase.Set_n_user_end(n_user);
sprintf(token, "Gas phase after simulation %d.", simulation);
snprintf(token, sizeof(token), "Gas phase after simulation %d.", simulation);
temp_gas_phase.Set_description(token);
temp_gas_phase.Set_new_def(false);
temp_gas_phase.Set_solution_equilibria(false);
Expand Down Expand Up @@ -2102,18 +2102,18 @@ run_simulations(void)
#endif

#if defined PHREEQCI_GUI
sprintf(token, "\nSimulation %d\n", simulation);
snprintf(token, sizeof(token), "\nSimulation %d\n", simulation);
screen_msg(token);
#endif
sprintf(token, "Reading input data for simulation %d.", simulation);
snprintf(token, sizeof(token), "Reading input data for simulation %d.", simulation);

dup_print(token, TRUE);
if (read_input() == EOF)
break;

if (title_x.size() > 0)
{
sprintf(token, "TITLE");
snprintf(token, sizeof(token), "TITLE");
dup_print(token, TRUE);
if (pr.headings == TRUE)
{
Expand Down