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

Shearwater import: avoid running atoi multiple times

Browse source 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
This commit is contained in:
Miika Turkia 2018-05-27 16:56:09 +03:00 committed by Lubomir I. Ivanov
parent bef573ae3f
commit a929c86584
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/import-shearwater.c
View file

@ -82,6 +82,7 @@ extern int shearwater_profile_sample(void *handle, int columns, char **data, cha
UNUSED(handle); UNUSED(handle);
UNUSED(columns); UNUSED(columns);
UNUSED(column); UNUSED(column);
int d6, d7;
sample_start(); sample_start();
if (data[0]) if (data[0])
@ -98,12 +99,14 @@ extern int shearwater_profile_sample(void *handle, int columns, char **data, cha
if (data[5]) if (data[5])
cur_sample->cns = atoi(data[5]); cur_sample->cns = atoi(data[5]);
if (data[6]) { if (data[6]) {
if (atoi(data[6]) > 0) { d6 = atoi(data[6]);
cur_sample->stopdepth.mm = metric ? atoi(data[6]) * 1000 : feet_to_mm(atoi(data[6])); if (d6 > 0) {
cur_sample->stopdepth.mm = metric ? d6 * 1000 : feet_to_mm(d6);
cur_sample->in_deco = 1; cur_sample->in_deco = 1;
} else if (data[7]) { } else if (data[7]) {
if (atoi(data[7]) > 0) { d7 = atoi(data[7]);
cur_sample->stopdepth.mm = metric ? atoi(data[7]) * 1000 : feet_to_mm(atoi(data[7])); if (d7 > 0) {
cur_sample->stopdepth.mm = metric ? d7 * 1000 : feet_to_mm(d7);
if (data[8]) { if (data[8]) {
cur_sample->stoptime.seconds = atoi(data[8]) * 60; cur_sample->stoptime.seconds = atoi(data[8]) * 60;
} }
@ -131,6 +134,7 @@ extern int shearwater_ai_profile_sample(void *handle, int columns, char **data,
UNUSED(handle); UNUSED(handle);
UNUSED(columns); UNUSED(columns);
UNUSED(column); UNUSED(column);
int d6, d9;
sample_start(); sample_start();
if (data[0]) if (data[0])
@ -147,12 +151,14 @@ extern int shearwater_ai_profile_sample(void *handle, int columns, char **data,
if (data[5]) if (data[5])
cur_sample->cns = atoi(data[5]); cur_sample->cns = atoi(data[5]);
if (data[6]) { if (data[6]) {
if (atoi(data[6]) > 0) { d6 = atoi(data[6]);
cur_sample->stopdepth.mm = metric ? atoi(data[6]) * 1000 : feet_to_mm(atoi(data[6])); if (d6 > 0) {
cur_sample->stopdepth.mm = metric ? d6 * 1000 : feet_to_mm(d6);
cur_sample->in_deco = 1; cur_sample->in_deco = 1;
} else if (data[9]) { } else if (data[9]) {
if (atoi(data[9]) > 0) { d9 = atoi(data[9]);
cur_sample->stopdepth.mm = metric ? atoi(data[9]) * 1000 : feet_to_mm(atoi(data[9])); if (d9 > 0) {
cur_sample->stopdepth.mm = metric ? d9 * 1000 : feet_to_mm(d9);
if (data[10]) { if (data[10]) {
cur_sample->stoptime.seconds = atoi(data[10]) * 60; cur_sample->stoptime.seconds = atoi(data[10]) * 60;
} }