From e4b8cf89a1b798a2f266b3dbc01b82155320ea9d Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 24 May 2014 14:02:08 -0700 Subject: Dive list: move trip merging logic into divelist.c This also fixes a couple of issues with the existing code: - removes a memory leak - treats null and "" the same Signed-off-by: Dirk Hohndel --- divelist.h | 1 + 1 file changed, 1 insertion(+) (limited to 'divelist.h') diff --git a/divelist.h b/divelist.h index 389a26930..4eafd5dd4 100644 --- a/divelist.h +++ b/divelist.h @@ -32,6 +32,7 @@ extern void select_dive(int idx); extern void deselect_dive(int idx); extern void select_dives_in_trip(struct dive_trip *trip); extern void deselect_dives_in_trip(struct dive_trip *trip); +extern void combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b); extern void find_new_trip_start_time(dive_trip_t *trip); extern struct dive *first_selected_dive(); extern struct dive *last_selected_dive(); -- cgit v1.2.3-70-g09d2