diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-11-27 00:25:15 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-09 20:58:04 -0800 |
| commit | 7e33369dc8b27b20385ab055b662e06bbf369784 (patch) | |
| tree | af674ccdd1ccb67d4de84d68cb585b481d020fb3 /core/import-shearwater.c | |
| parent | ec37c71f5eeb7d4b0c4b8719b52583fadb0b8f4c (diff) | |
| download | subsurface-7e33369dc8b27b20385ab055b662e06bbf369784.tar.gz | |
Parser: add trip_table parameter to parsing functions
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>
Diffstat (limited to 'core/import-shearwater.c')
| -rw-r--r-- | core/import-shearwater.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/import-shearwater.c b/core/import-shearwater.c index 451b04fe5..b4815d960 100644 --- a/core/import-shearwater.c +++ b/core/import-shearwater.c @@ -438,7 +438,7 @@ static int shearwater_cloud_dive(void *param, int columns, char **data, char **c } int parse_shearwater_buffer(sqlite3 *handle, const char *url, const char *buffer, int size, - struct dive_table *table) + struct dive_table *table, struct trip_table *trips) { UNUSED(buffer); UNUSED(size); @@ -449,6 +449,7 @@ int parse_shearwater_buffer(sqlite3 *handle, const char *url, const char *buffer init_parser_state(&state); state.target_table = table; + state.trips = trips; state.sql_handle = handle; // So far have not seen any sample rate in Shearwater Desktop @@ -468,7 +469,7 @@ int parse_shearwater_buffer(sqlite3 *handle, const char *url, const char *buffer } int parse_shearwater_cloud_buffer(sqlite3 *handle, const char *url, const char *buffer, int size, - struct dive_table *table) + struct dive_table *table, struct trip_table *trips) { UNUSED(buffer); UNUSED(size); @@ -479,6 +480,7 @@ int parse_shearwater_cloud_buffer(sqlite3 *handle, const char *url, const char * init_parser_state(&state); state.target_table = table; + state.trips = trips; state.sql_handle = handle; char get_dives[] = "select l.number,strftime('%s', DiveDate),location||' / '||site,buddy,notes,imperialUnits,maxDepth,maxTime,startSurfacePressure,computerSerial,computerModel,d.diveId,l.sampleRateMs FROM dive_details AS d JOIN dive_logs AS l ON d.diveId=l.diveId"; |