mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: fix narrowing type conversion warning

Browse source 
In pscr_o2() the result of a double calculation was implicitly
converted to int, which resulted in a gcc warning.

Part of the expression was explicitly converted to int, but then
subtracted from a double.

Instead, do all the calculations in double and cast the final
expression to int. This is probably the prudent thing to do.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-01-01 22:22:40 +01:00 • committed by Dirk Hohndel
parent 4458535265
commit d89ef3d906
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/gas.c
View file

@ -98,8 +98,10 @@ fraction_t get_gas_component_fraction(struct gasmix mix, enum gas_component comp
// O2 pressure in mbar according to the steady state model for the PSCR // O2 pressure in mbar according to the steady state model for the PSCR
// NB: Ambient pressure comes in bar! // NB: Ambient pressure comes in bar!
int pscr_o2(const double amb_pressure, struct gasmix mix) { int pscr_o2(const double amb_pressure, struct gasmix mix)
int o2 = get_o2(mix) * amb_pressure - (int)((1.0 - get_o2(mix) / 1000.0) * prefs.o2consumption / (prefs.bottomsac * prefs.pscr_ratio) * 1000000); {
int o2 = (int)(get_o2(mix) * amb_pressure -
(1.0 - get_o2(mix) / 1000.0) * prefs.o2consumption / (prefs.bottomsac * prefs.pscr_ratio) * 1000000);
if (o2 < 0.0) // He's dead, Jim. if (o2 < 0.0) // He's dead, Jim.
o2 = 0.0; o2 = 0.0;
return o2; return o2;