mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[smtk-import] Do not create cylinders structure before libdc parsing

Browse source 
The d->cylinders created will be overriden by libdivecomputer parsing,
resulting in 0, 1 , may be 2 cylinders depending on DC data. This is not
what we want when importing a divelog, because we will miss all hand
entered tanks.
BTW, using get_cylinder() on tank number bigger than created, results in
a NULL pointer and a crash.
As we can't foresee how many tanks (or even it's positional numbers in
log) a diver has used, the full 10 tanks supported by SmarTrak can be
easily created and parsed using get_or_create_cylinder(), and unused
cleaned later.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
This commit is contained in:
Salvador Cuñat 2020-04-19 07:38:19 +02:00 committed by Dirk Hohndel
parent eb6dfd3745
commit 6c9a9b2fb5
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
smtk-import/smartrak.c
View file

@ -976,8 +976,6 @@ void smartrak_import(const char *file, struct dive_table *divetable)
dc_family_t dc_fam = DC_FAMILY_NULL; dc_family_t dc_fam = DC_FAMILY_NULL;
unsigned char *prf_buffer, *hdr_buffer, *compl_buffer; unsigned char *prf_buffer, *hdr_buffer, *compl_buffer;
struct dive *smtkdive = alloc_dive(); struct dive *smtkdive = alloc_dive();
for (i = 0; i < tanks; ++i)
add_empty_cylinder(&smtkdive->cylinders);
struct tm *tm_date = malloc(sizeof(struct tm)); struct tm *tm_date = malloc(sizeof(struct tm));
size_t hdr_length, prf_length; size_t hdr_length, prf_length;
dc_status_t rc = 0; dc_status_t rc = 0;
@ -1038,24 +1036,27 @@ void smartrak_import(const char *file, struct dive_table *divetable)
int tankidxcol = coln(TANKIDX); int tankidxcol = coln(TANKIDX);
for (i = 0; i < tanks; i++) { for (i = 0; i < tanks; i++) {
if (get_cylinder(smtkdive, i)->start.mbar == 0) cylinder_t *tmptank = get_or_create_cylinder(smtkdive, i);
get_cylinder(smtkdive, i)->start.mbar = lrint(strtod(col[(i * 2) + pstartcol]->bind_ptr, NULL) * 1000); if (! tmptank)
break;
if (tmptank->start.mbar == 0)
tmptank->start.mbar = lrint(strtod(col[(i * 2) + pstartcol]->bind_ptr, NULL) * 1000);
/* /*
* If there is a start pressure ensure that end pressure is not zero as * If there is a start pressure ensure that end pressure is not zero as
* will be registered in DCs which only keep track of differential pressures, * will be registered in DCs which only keep track of differential pressures,
* and collect the data registered by the user in mdb * and collect the data registered by the user in mdb
*/ */
if (get_cylinder(smtkdive, i)->end.mbar == 0 && get_cylinder(smtkdive, i)->start.mbar != 0) if (tmptank->end.mbar == 0 && tmptank->start.mbar != 0)
get_cylinder(smtkdive, i)->end.mbar = lrint(strtod(col[(i * 2) + 1 + pstartcol]->bind_ptr, NULL) * 1000 ? : 1000); tmptank->end.mbar = lrint(strtod(col[(i * 2) + 1 + pstartcol]->bind_ptr, NULL) * 1000 ? : 1000);
if (get_cylinder(smtkdive, i)->gasmix.o2.permille == 0) if (tmptank->gasmix.o2.permille == 0)
get_cylinder(smtkdive, i)->gasmix.o2.permille = lrint(strtod(col[i + o2fraccol]->bind_ptr, NULL) * 10); tmptank->gasmix.o2.permille = lrint(strtod(col[i + o2fraccol]->bind_ptr, NULL) * 10);
if (smtk_version == 10213) { if (smtk_version == 10213) {
if (get_cylinder(smtkdive, i)->gasmix.he.permille == 0) if (tmptank->gasmix.he.permille == 0)
get_cylinder(smtkdive, i)->gasmix.he.permille = lrint(strtod(col[i + hefraccol]->bind_ptr, NULL) * 10); tmptank->gasmix.he.permille = lrint(strtod(col[i + hefraccol]->bind_ptr, NULL) * 10);
} else { } else {
get_cylinder(smtkdive, i)->gasmix.he.permille = 0; tmptank->gasmix.he.permille = 0;
} }
smtk_build_tank_info(mdb_clon, get_cylinder(smtkdive, i), col[i + tankidxcol]->bind_ptr); smtk_build_tank_info(mdb_clon, tmptank, col[i + tankidxcol]->bind_ptr);
} }
/* Check for duplicated cylinders and clean them */ /* Check for duplicated cylinders and clean them */
smtk_clean_cylinders(smtkdive); smtk_clean_cylinders(smtkdive);