diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-17 12:32:22 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-24 09:51:37 -0700 |
| commit | a2614665942959b95eef8453730cd3ac66ac42a3 (patch) | |
| tree | e8491231112634e6fa188a605ddab47910cfe8c2 /core/import-shearwater.c | |
| parent | 41975435a2a93733a0e46a7e594ffba193be6e87 (diff) | |
| download | subsurface-a2614665942959b95eef8453730cd3ac66ac42a3.tar.gz | |
parser: add device_table to parser state
If we want to avoid the parsers to directly modify global data,
we have to provide a device_table to parse into. This adds such
a state and the corresponding function parameters. However,
for now this is unused.
Adding new parameters is very painful and this commit shows that
we urgently need a "struct divelog" collecting all those tables!
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/import-shearwater.c')
| -rw-r--r-- | core/import-shearwater.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/import-shearwater.c b/core/import-shearwater.c index 0b0fa8799..4dd67de2b 100644 --- a/core/import-shearwater.c +++ b/core/import-shearwater.c @@ -485,7 +485,8 @@ 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 trip_table *trips, struct dive_site_table *sites) + struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, + struct device_table *devices) { UNUSED(buffer); UNUSED(size); @@ -497,6 +498,7 @@ int parse_shearwater_buffer(sqlite3 *handle, const char *url, const char *buffer state.target_table = table; state.trips = trips; state.sites = sites; + state.devices = devices; state.sql_handle = handle; // So far have not seen any sample rate in Shearwater Desktop @@ -516,7 +518,8 @@ 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 trip_table *trips, struct dive_site_table *sites) + struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, + struct device_table *devices) { UNUSED(buffer); UNUSED(size); @@ -528,6 +531,7 @@ int parse_shearwater_cloud_buffer(sqlite3 *handle, const char *url, const char * state.target_table = table; state.trips = trips; state.sites = sites; + state.devices = devices; state.sql_handle = handle; char get_dives[] = "select l.number,strftime('%s', DiveDate),location||' / '||site,buddy,notes,imperialUnits,maxDepth,DiveLengthTime,startSurfacePressure,computerSerial,computerModel,d.diveId,l.sampleRateMs / 1000 FROM dive_details AS d JOIN dive_logs AS l ON d.diveId=l.diveId"; |