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

Dive site: pass dive-site pointers to merge_dive_sites()

Browse source 
Instead of passing uuids, pass a pointer to the dive site.
This is small step in an effort to remove uuids.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-23 19:40:41 +02:00 • committed by Dirk Hohndel
parent f527a70831
commit 64f0902e0d
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/divesite.h
View file

@ -72,7 +72,7 @@ void merge_dive_site(struct dive_site *a, struct dive_site *b);
void clear_dive_site(struct dive_site *ds);
unsigned int get_distance(const location_t *loc1, const location_t *loc2);
struct dive_site *find_or_create_dive_site_with_name(const char *name, timestamp_t divetime);
void merge_dive_sites(uint32_t ref, uint32_t *uuids, int count);
void merge_dive_sites(struct dive_site *ref, struct dive_site *dive_sites[], int count);
#ifdef __cplusplus
}