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: add trip_table parameter to parsing functions

Browse source 
To allow parsing into arbitrary trip_tables, add the corresponding
parameter to the parsing functions and the parser state. Currently,
all callers pass the global trip_table so there should be no change
in functionality. These arguments will be replaced in subsequent commits.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-11-27 00:25:15 +01:00 • committed by Dirk Hohndel
parent ec37c71f5e
commit 7e33369dc8
28 changed files with 157 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/datatrak.c
View file

@ -14,6 +14,7 @@
#include "units.h"
#include "device.h"
#include "file.h"
#include "ssrf.h"
unsigned char lector_bytes[2], lector_word[4], tmp_1byte, *byte;
unsigned int tmp_2bytes;
@ -576,8 +577,9 @@ bail:
* Main function call from file.c memblock is allocated (and freed) there.
* If parsing is aborted due to errors, stores correctly parsed dives.
*/
int datatrak_import(struct memblock *mem, struct dive_table *table)
int datatrak_import(struct memblock *mem, struct dive_table *table, struct trip_table *trips)
{
UNUSED(trips);
unsigned char *runner;
int i = 0, numdives = 0, rc = 0;