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

Cleanup: remove deletion of webservice dive sites

Browse source 
In the XML and git savers, unchanged webservice-dive sites were
deleted. Since the webservice is not functional anymore, remove
this code.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-02-26 22:01:17 +01:00 • committed by Dirk Hohndel
parent 3c2dd7f7c6
commit dd0ded1a9e
2 changed files with 4 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/save-git.c
View file

@ -883,24 +883,9 @@ static void save_divesites(git_repository *repo, struct dir *tree)
for (int i = 0; i < dive_site_table.nr; i++) {
struct membuffer b = { 0 };
struct dive_site *ds = get_dive_site(i);
if (!is_dive_site_used(ds, false)) {
/* Only write used dive sites */
/* Only write used dive sites */
if (!is_dive_site_used(ds, false))
continue;
} else if (ds->name &&
(strncmp(ds->name, "Auto-created dive", 17) == 0 ||
strncmp(ds->name, "New Dive", 8) == 0)) {
fprintf(stderr, "found an auto divesite %s\n", ds->name);
// 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, false)) {
if (verbose)
fprintf(stderr, "Deleted unused auto-created dive site %s\n", ds->name);
delete_dive_site(ds);
i--; // since we just deleted that one
continue;
}
}
struct membuffer site_file_name = { 0 };
put_format(&site_file_name, "Site-%08x", ds->uuid);
show_utf8(&b, "name ", ds->name, "\n");

18
core/save-xml.c
View file

@ -596,23 +596,9 @@ void save_dives_buffer(struct membuffer *b, const bool select_only, bool anonymi
put_format(b, "<divesites>\n");
for (i = 0; i < dive_site_table.nr; i++) {
struct dive_site *ds = get_dive_site(i);
if (!is_dive_site_used(ds, false)) {
/* Only write used dive sites */
/* Only write used dive sites */
if (!is_dive_site_used(ds, false))
continue;
} else if (ds->name &&
(strncmp(ds->name, "Auto-created dive", 17) == 0 ||
strncmp(ds->name, "New Dive", 8) == 0)) {
// 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, false)) {
if (verbose)
fprintf(stderr, "Deleted unused auto-created dive site %s\n", ds->name);
delete_dive_site(ds);
i--; // since we just deleted that one
continue;
}
}
if (select_only && !is_dive_site_used(ds, true))
continue;