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: remove unused parameter used from find_best_gasmix_match()

Browse source 
The last direct user of the used parameter was removed in
16276faa45, the last actual user in
e2bbd0ceec.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-06-05 20:31:35 +02:00 • committed by Dirk Hohndel
parent 219c230506
commit 3e88bd686f
5 changed files with 5 additions and 7 deletions

2
core/dive.c
View file

@ -1431,7 +1431,7 @@ static bool validate_gaschange(struct dive *dive, struct event *event)
if (event->gas.index >= 0)
return true;
index = find_best_gasmix_match(event->gas.mix, dive->cylinder, 0);
index = find_best_gasmix_match(event->gas.mix, dive->cylinder);
if (index < 0)
return false;

4
core/equipment.c
View file

@ -109,7 +109,7 @@ int gas_volume(const cylinder_t *cyl, pressure_t p)
return lrint(cyl->type.size.mliter * bar_to_atm(bar) / z_factor);
}
int find_best_gasmix_match(struct gasmix mix, const cylinder_t array[], unsigned int used)
int find_best_gasmix_match(struct gasmix mix, const cylinder_t array[])
{
int i;
int best = -1, score = INT_MAX;
@ -118,8 +118,6 @@ int find_best_gasmix_match(struct gasmix mix, const cylinder_t array[], unsigned
const cylinder_t *match;
int distance;
if (used & (1 << i))
continue;
match = array + i;
if (cylinder_nodata(match))
continue;

2
core/equipment.h
View file

@ -55,7 +55,7 @@ extern void remove_cylinder(struct dive *dive, int idx);
extern void remove_weightsystem(struct dive *dive, int idx);
extern void reset_cylinders(struct dive *dive, bool track_gas);
extern int gas_volume(const cylinder_t *cyl, pressure_t p); /* Volume in mliter of a cylinder at pressure 'p' */
extern int find_best_gasmix_match(struct gasmix mix, const cylinder_t array[], unsigned int used);
extern int find_best_gasmix_match(struct gasmix mix, const cylinder_t array[]);
#ifdef DEBUG_CYL
extern void dump_cylinders(struct dive *dive, bool verbose);
#endif

2
core/planner.c
View file

@ -91,7 +91,7 @@ int get_cylinderid_at_time(struct dive *dive, struct divecomputer *dc, duration_
int get_gasidx(struct dive *dive, struct gasmix mix)
{
return find_best_gasmix_match(mix, dive->cylinder, 0);
return find_best_gasmix_match(mix, dive->cylinder);
}
void interpolate_transition(struct deco_state *ds, struct dive *dive, duration_t t0, duration_t t1, depth_t d0, depth_t d1, struct gasmix gasmix, o2pressure_t po2, enum divemode_t divemode)

2
core/profile.c
View file

@ -334,7 +334,7 @@ int get_cylinder_index(const struct dive *dive, const struct event *ev)
fprintf(stderr, "Still looking up cylinder based on gas mix in get_cylinder_index()!\n");
mix = get_gasmix_from_event(dive, ev);
best = find_best_gasmix_match(mix, dive->cylinder, 0);
best = find_best_gasmix_match(mix, dive->cylinder);
return best < 0 ? 0 : best;
}