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

Use the new get_o2()/get_he() helper functions more widely

Browse source 
They do the "02=0 means air" thing autmatically, and make for less
typing.  So use them more widely in places that looked up the o2 and he
permille values of a gasmix.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2013-03-28 10:06:43 -07:00 • committed by Dirk Hohndel
parent 99070c49e2
commit 1b05d28944
4 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dive.c
View file

@ -1021,9 +1021,8 @@ static void merge_weightsystem_info(weightsystem_t *res, weightsystem_t *a, weig
static int gasmix_distance(const struct gasmix *a, const struct gasmix *b)
{
int a_o2 = a->o2.permille ? : O2_IN_AIR;
int b_o2 = b->o2.permille ? : O2_IN_AIR;
int a_he = a->he.permille, b_he = b->he.permille;
int a_o2 = get_o2(a), b_o2 = get_o2(b);
int a_he = get_he(a), b_he = get_he(b);
int delta_o2 = a_o2 - b_o2, delta_he = a_he - b_he;
delta_he = delta_he*delta_he;
@ -1064,8 +1063,8 @@ static void add_initial_gaschange(struct dive *dive, struct divecomputer *dc)
return;
/* Old starting gas mix */
o2 = dive->cylinder[0].gasmix.o2.permille ? : O2_IN_AIR;
he = dive->cylinder[0].gasmix.o2.permille;
o2 = get_o2(&dive->cylinder[0].gasmix);
he = get_he(&dive->cylinder[0].gasmix);
o2 = (o2 + 5) / 10;
he = (he + 5) / 10;
value = o2 + (he << 16);