diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-09-21 14:10:53 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-09-21 16:07:24 -0700 |
| commit | 44a291a09f06733ff84dc99d532351d6cbc927c6 (patch) | |
| tree | b905d21f3a9a1b369b45370ea76b5b48819545e6 /core | |
| parent | fe7c0b30856d1286ea9a521ca9fb01e4952b6275 (diff) | |
| download | subsurface-44a291a09f06733ff84dc99d532351d6cbc927c6.tar.gz | |
Export: move dive site selection logic to C++
When exporting dive sites, the dive sites to be selected were collected
in the C-core. But that doesn't have access to the selected dive sites
if in dive site mode. Therefore, collect the dive sites in C++ and
pass down to the core. Use a std::vector to avoid memory management
woes.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/dive.h | 2 | ||||
| -rw-r--r-- | core/save-xml.c | 16 |
2 files changed, 6 insertions, 12 deletions
diff --git a/core/dive.h b/core/dive.h index 72928c5ec..517c18c8b 100644 --- a/core/dive.h +++ b/core/dive.h @@ -304,7 +304,7 @@ extern int save_dives_logic(const char *filename, bool select_only, bool anonymi extern int save_dive(FILE *f, struct dive *dive, bool anonymize); extern int export_dives_xslt(const char *filename, const bool selected, const int units, const char *export_xslt, bool anonymize); -extern int save_dive_sites_logic(const char *filename, bool select_only, bool anonymize); +extern int save_dive_sites_logic(const char *filename, const struct dive_site *sites[], int nr_sites, bool anonymize); struct membuffer; extern void save_one_dive_to_mb(struct membuffer *b, struct dive *dive, bool anonymize); diff --git a/core/save-xml.c b/core/save-xml.c index c2e9828d1..356ee36a7 100644 --- a/core/save-xml.c +++ b/core/save-xml.c @@ -811,20 +811,14 @@ int export_dives_xslt(const char *filename, const bool selected, const int units return res; } -static void save_dive_sites_buffer(struct membuffer *b, const bool select_only, bool anonymize) +static void save_dive_sites_buffer(struct membuffer *b, const struct dive_site *sites[], int nr_sites, bool anonymize) { int i; put_format(b, "<divesites program='subsurface' version='%d'>\n", DATAFORMAT_VERSION); /* save the dive sites */ - for (i = 0; i < dive_site_table.nr; i++) { - struct dive_site *ds = get_dive_site(i, &dive_site_table); - /* Don't export empty dive sites */ - if (dive_site_is_empty(ds)) - continue; - /* Only write used dive sites when exporting selected dives */ - if (select_only && !is_dive_site_selected(ds)) - continue; + for (i = 0; i < nr_sites; i++) { + const struct dive_site *ds = sites[i]; put_format(b, "<site uuid='%8x'", ds->uuid); show_utf8_blanked(b, ds->name, " name='", "'", 1, anonymize); @@ -848,13 +842,13 @@ static void save_dive_sites_buffer(struct membuffer *b, const bool select_only, put_format(b, "</divesites>\n"); } -int save_dive_sites_logic(const char *filename, const bool select_only, bool anonymize) +int save_dive_sites_logic(const char *filename, const struct dive_site *sites[], int nr_sites, bool anonymize) { struct membuffer buf = { 0 }; FILE *f; int error = 0; - save_dive_sites_buffer(&buf, select_only, anonymize); + save_dive_sites_buffer(&buf, sites, nr_sites, anonymize); if (same_string(filename, "-")) { f = stdout; |