From 32a4ce61694bfe8364227440ea5716df7cc61fd1 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 28 Sep 2018 13:59:01 +0200 Subject: 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 --- core/cochran.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'core/cochran.c') 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 -- cgit v1.2.3-70-g09d2