Use proper types

This is step one of many to use gasmix instead of int o2/he.
Right now some of these changes look ridiculous because after changing a
few lines we immediately go back to o2 = get_o2(gas). The reason is that I
wanted to convert a hand full of functions at a time. So in this commit I
only change validate_gas(), get_gas_from_events() and get_gasidx() to use
a struct gasmix instead of int o2, int he.

This state builds and survived some mild testing. Let's continue on top of
that.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/planner.h b/planner.h
index d5607a948..5542be14e 100644
--- a/planner.h
+++ b/planner.h
@@ -6,13 +6,13 @@
 extern "C" {
 #endif
 
-extern int validate_gas(const char *text, int *o2_p, int *he_p);
+extern int validate_gas(const char *text, struct gasmix *gas);
 extern int validate_po2(const char *text, int *mbar_po2);
 extern timestamp_t current_time_notz(void);
 extern void show_planned_dive(char **error_string_p);
 extern void set_last_stop(bool last_stop_6m);
-extern void get_gas_from_events(struct divecomputer *dc, int time, int *o2, int *he);
-extern int get_gasidx(struct dive *dive, int o2, int he);
+extern void get_gas_from_events(struct divecomputer *dc, int time, struct gasmix *gas);
+extern int get_gasidx(struct dive *dive, struct gasmix *mix);
 extern bool diveplan_empty(struct diveplan *diveplan);
 
 extern struct dive *planned_dive;