diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-05 22:58:47 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | e2df38d868324f2a767d2109cdd8727acb866ca2 (patch) | |
| tree | 614b560431d2c61f3f2b1e2f986c7806bd175ae9 /core/divesite.c | |
| parent | c22fd9f4fd6699333629b8acb1e9c135a9783082 (diff) | |
| download | subsurface-e2df38d868324f2a767d2109cdd8727acb866ca2.tar.gz | |
Dive site: add dive site ref-counting
Instead of setting dive->dive_site directly, call the
add_dive_to_dive_site() and unregister_dive_from_dive_site()
functions. In the parser this turned out to be a bit tricky.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divesite.c')
| -rw-r--r-- | core/divesite.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/divesite.c b/core/divesite.c index d53b72b4b..45a3221be 100644 --- a/core/divesite.c +++ b/core/divesite.c @@ -339,7 +339,8 @@ void merge_dive_sites(struct dive_site *ref, struct dive_site *dive_sites[], int for_each_dive(curr_dive, d) { if (d->dive_site != dive_sites[i] ) continue; - d->dive_site = ref; + unregister_dive_from_dive_site(d); + add_dive_to_dive_site(d, ref); invalidate_dive_cache(d); } } @@ -377,7 +378,7 @@ void purge_empty_dive_sites(struct dive_site_table *ds_table) continue; for_each_dive(j, d) { if (d->dive_site == ds) - d->dive_site = NULL; + unregister_dive_from_dive_site(d); } } } @@ -387,8 +388,10 @@ void add_dive_to_dive_site(struct dive *d, struct dive_site *ds) int idx; if (d->dive_site == ds) return; - if (d->dive_site) + if (d->dive_site) { fprintf(stderr, "Warning: adding dive that already belongs to a dive site to a different site\n"); + unregister_dive_from_dive_site(d); + } idx = dive_table_get_insertion_index(&ds->dives, d); add_to_dive_table(&ds->dives, idx, d); d->dive_site = ds; |