diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-23 18:55:42 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-29 00:09:31 +0000 |
| commit | 8de471f90e95a5a75d0fec78d5bbf900eb90f235 (patch) | |
| tree | 62812fb5aab9f6a8cb17db8969ab4e10eb041de0 /core/save-xml.c | |
| parent | 14ab95608cc0694caff580825666d2009177e0a2 (diff) | |
| download | subsurface-8de471f90e95a5a75d0fec78d5bbf900eb90f235.tar.gz | |
Dive site: pass dive-site pointer to is_dive_site_used()
Instead of passing a uuid, 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>
Diffstat (limited to 'core/save-xml.c')
| -rw-r--r-- | core/save-xml.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/save-xml.c b/core/save-xml.c index fad5f584a..b4c952468 100644 --- a/core/save-xml.c +++ b/core/save-xml.c @@ -600,7 +600,7 @@ void save_dives_buffer(struct membuffer *b, const bool select_only, bool anonymi int j; struct dive *d; struct dive_site *ds = get_dive_site(i); - if (dive_site_is_empty(ds) || !is_dive_site_used(ds->uuid, false)) { + if (dive_site_is_empty(ds) || !is_dive_site_used(ds, false)) { for_each_dive(j, d) { if (d->dive_site_uuid == ds->uuid) d->dive_site_uuid = 0; @@ -614,7 +614,7 @@ void save_dives_buffer(struct membuffer *b, const bool select_only, bool anonymi // these are the two default names for sites from // the web service; if the site isn't used in any // dive (really? you didn't rename it?), delete it - if (!is_dive_site_used(ds->uuid, false)) { + if (!is_dive_site_used(ds, false)) { if (verbose) fprintf(stderr, "Deleted unused auto-created dive site %s\n", ds->name); delete_dive_site(ds->uuid); @@ -622,7 +622,7 @@ void save_dives_buffer(struct membuffer *b, const bool select_only, bool anonymi continue; } } - if (select_only && !is_dive_site_used(ds->uuid, true)) + if (select_only && !is_dive_site_used(ds, true)) continue; put_format(b, "<site uuid='%8x'", ds->uuid); |