mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-17 20:16:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[smtk-import] Fix useless NULL check and white space issues

Browse source 
As commented by Berthold and Dirk for previous patches.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
This commit is contained in:
Salvador Cuñat 2020-04-19 18:44:24 +02:00 • committed by Dirk Hohndel
parent e139b7b15f
commit 5a0f2fc2cc
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
smtk-import/smartrak.c
View file

@ -44,8 +44,7 @@ static void smtk_free(char **array, int count)
{ {
int n; int n;
for (n = 0; n < count; n++) for (n = 0; n < count; n++)
if (array[n]) free(array[n]);
free(array[n]);
array = NULL; array = NULL;
} }
@ -728,7 +727,7 @@ static void smtk_parse_relations(MdbHandle *mdb, struct dive *dive, char *dive_i
/* Get the text associated with the relations */ /* Get the text associated with the relations */
for (d_runner = diverel_head; d_runner; d_runner = d_runner->next) { for (d_runner = diverel_head; d_runner; d_runner = d_runner->next) {
if (! list[d_runner->idx - 1]) if (!list[d_runner->idx - 1])
continue; continue;
if (tag) if (tag)
taglist_add_tag(&dive->tag_list, list[d_runner->idx - 1]); taglist_add_tag(&dive->tag_list, list[d_runner->idx - 1]);
@ -1040,7 +1039,7 @@ void smartrak_import(const char *file, struct dive_table *divetable)
for (i = 0; i < tanks; i++) { for (i = 0; i < tanks; i++) {
cylinder_t *tmptank = get_or_create_cylinder(smtkdive, i); cylinder_t *tmptank = get_or_create_cylinder(smtkdive, i);
if (! tmptank) if (!tmptank)
break; break;
if (tmptank->start.mbar == 0) if (tmptank->start.mbar == 0)
tmptank->start.mbar = lrint(strtod(col[(i * 2) + pstartcol]->bind_ptr, NULL) * 1000); tmptank->start.mbar = lrint(strtod(col[(i * 2) + pstartcol]->bind_ptr, NULL) * 1000);
@ -1050,7 +1049,7 @@ void smartrak_import(const char *file, struct dive_table *divetable)
* and collect the data registered by the user in mdb * and collect the data registered by the user in mdb
*/ */
if (tmptank->end.mbar == 0 && tmptank->start.mbar != 0) if (tmptank->end.mbar == 0 && tmptank->start.mbar != 0)
tmptank->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 (tmptank->gasmix.o2.permille == 0) if (tmptank->gasmix.o2.permille == 0)
tmptank->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) {