mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: move gasname() to struct gasmix
Also, turn it to use std::string instead of writing into a global(!) buffer. This was not reentrant. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
9c726d8d6f
commit
22a1120b30
14 changed files with 46 additions and 52 deletions
|
@ -422,7 +422,7 @@ static std::vector<gaschanges> analyze_gaslist(struct diveplan *diveplan, struct
|
|||
for (size_t nr = 0; nr < gaschanges.size(); nr++) {
|
||||
int idx = gaschanges[nr].gasidx;
|
||||
printf("gaschange nr %d: @ %5.2lfm gasidx %d (%s)\n", nr, gaschanges[nr].depth / 1000.0,
|
||||
idx, gasname(&dive.get_cylinder(idx)->gasmix));
|
||||
idx, dive.get_cylinder(idx)->gasmix.name().c_str());
|
||||
}
|
||||
#endif
|
||||
return gaschanges;
|
||||
|
@ -737,7 +737,7 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
|
|||
}
|
||||
|
||||
#if DEBUG_PLAN & 4
|
||||
printf("gas %s\n", gasname(&gas));
|
||||
printf("gas %s\n", gas.name().c_str());
|
||||
printf("depth %5.2lfm \n", depth / 1000.0);
|
||||
printf("current_cylinder %i\n", current_cylinder);
|
||||
#endif
|
||||
|
@ -876,7 +876,7 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
|
|||
else
|
||||
current_cylinder = get_gasidx(dive, gas);
|
||||
if (current_cylinder == -1) {
|
||||
report_error(translate("gettextFromC", "Can't find gas %s"), gasname(gas));
|
||||
report_error(translate("gettextFromC", "Can't find gas %s"), gas.name().c_str());
|
||||
current_cylinder = 0;
|
||||
}
|
||||
reset_regression(ds);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue