diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-09-28 13:59:01 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-28 15:06:00 -0700 |
| commit | 32a4ce61694bfe8364227440ea5716df7cc61fd1 (patch) | |
| tree | 257ac4f9204182b20d7e4bda7bc80911bc6303a6 /core/cochran.c | |
| parent | a5db03c2b32115b14e4b83501a0771b186d87913 (diff) | |
| download | subsurface-32a4ce61694bfe8364227440ea5716df7cc61fd1.tar.gz | |
Parser: parse text-based files into arbitrary table
In d815e0c9476ef62e6b84fb28ce48ab7cddefe77e a dive_table pointer
was added to the parsing functions to allow parsing into tables
other than the global dive table. This will be necessary for undo of
import and implementation a cleaner interface. A few cases, notably
CSV and proprietary formats were forgotten.
Implement parsing into arbitrary tables also for these cases.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/cochran.c')
| -rw-r--r-- | core/cochran.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/cochran.c b/core/cochran.c index a8f008c4c..164b94bee 100644 --- a/core/cochran.c +++ b/core/cochran.c @@ -600,7 +600,8 @@ static void cochran_parse_samples(struct dive *dive, const unsigned char *log, } static void cochran_parse_dive(const unsigned char *decode, unsigned mod, - const unsigned char *in, unsigned size) + const unsigned char *in, unsigned size, + struct dive_table *table) { unsigned char *buf = malloc(size); struct dive *dive; @@ -785,13 +786,13 @@ static void cochran_parse_dive(const unsigned char *decode, unsigned mod, } dive->downloaded = true; - record_dive(dive); + record_dive_to_table(dive, table); mark_divelist_changed(true); free(buf); } -int try_to_open_cochran(const char *filename, struct memblock *mem) +int try_to_open_cochran(const char *filename, struct memblock *mem, struct dive_table *table) { UNUSED(filename); unsigned int i; @@ -822,7 +823,7 @@ int try_to_open_cochran(const char *filename, struct memblock *mem) break; cochran_parse_dive(decode, mod, mem->buffer + dive1, - dive2 - dive1); + dive2 - dive1, table); } return 1; // no further processing needed |