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: replace dive->dive_site_uuid by dive_site

Browse source 
Replace the UUID reference of struct dive by a pointer to dive_site.
This commit is rather large in lines, but nevertheless quite simple
since most of the UUID->pointer work was done in previous commits.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-26 17:03:54 +02:00 • committed by Dirk Hohndel
parent acd44467c1
commit 724055f0af
28 changed files with 181 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/divesite.c
View file

@ -138,7 +138,7 @@ int nr_of_dives_at_dive_site(struct dive_site *ds, bool select_only)
if (!ds)
return 0;
for_each_dive(j, d) {
if (d->dive_site_uuid == ds->uuid && (!select_only || d->selected)) {
if (d->dive_site == ds && (!select_only || d->selected)) {
nr++;
}
}
@ -153,7 +153,7 @@ bool is_dive_site_used(struct dive_site *ds, bool select_only)
if (!ds)
return false;
for_each_dive(j, d) {
if (d->dive_site_uuid == ds->uuid && (!select_only || d->selected)) {
if (d->dive_site == ds && (!select_only || d->selected)) {
found = true;
break;
}
@ -318,9 +318,9 @@ void merge_dive_sites(struct dive_site *ref, struct dive_site *dive_sites[], int
continue;
for_each_dive(curr_dive, d) {
if (d->dive_site_uuid != dive_sites[i]->uuid )
if (d->dive_site != dive_sites[i] )
continue;
d->dive_site_uuid = ref->uuid;
d->dive_site = ref;
invalidate_dive_cache(d);
}
}