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

Parser: parse text-based files into arbitrary table

Browse source 
In d815e0c947 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>
This commit is contained in:
Berthold Stoeger 2018-09-28 13:59:01 +02:00 • committed by Dirk Hohndel
parent a5db03c2b3
commit 32a4ce6169
10 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/cochran.c
View file

@ -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