[PATCH] Use add_gas_switch_event in instead of duplicate

Anton Lundin glance at acc.umu.se
Wed Nov 20 11:09:52 UTC 2013


There is a add_gas_switch_event, so don't duplicate the code.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 planner.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/planner.c b/planner.c
index f104ad7..5ef6696 100644
--- a/planner.c
+++ b/planner.c
@@ -267,11 +267,10 @@ struct dive *create_dive_from_plan(struct diveplan *diveplan, const char **error
 		if (o2 != oldo2 || he != oldhe) {
 			int plano2 = (o2 + 5) / 10 * 10;
 			int planhe = (he + 5) / 10 * 10;
-			int value;
-			if (add_gas(dive, plano2, planhe) < 0)
+			int idx;
+			if (idx = add_gas(dive, plano2, planhe) < 0)
 				goto gas_error_exit;
-			value = (plano2 / 10) | ((planhe / 10) << 16);
-			add_event(dc, lasttime, 25, 0, value, "gaschange"); // SAMPLE_EVENT_GASCHANGE2
+			add_gas_switch_event(dive, dc, lasttime, idx);
 			oldo2 = o2; oldhe = he;
 		}
 		/* Create sample */
-- 
1.8.3.2



More information about the subsurface mailing list