diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-24 14:02:08 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-05-24 14:03:36 -0700 |
| commit | e4b8cf89a1b798a2f266b3dbc01b82155320ea9d (patch) | |
| tree | 04ffc21b2e14f6b53419e00afa54cfcb04c6fcd8 /divelist.h | |
| parent | 10e567515161f23510874236efd2f105c033ecec (diff) | |
| download | subsurface-e4b8cf89a1b798a2f266b3dbc01b82155320ea9d.tar.gz | |
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 <dirk@hohndel.org>
Diffstat (limited to 'divelist.h')
| -rw-r--r-- | divelist.h | 1 |
1 files changed, 1 insertions, 0 deletions
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(); |