summaryrefslogtreecommitdiffstats
path: root/core/import-divinglog.c
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-08-04 18:59:14 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-11-09 19:19:04 +0100
commit8df3705152aa32d8551b5fb7db08e0c8e442b480 (patch)
tree60879e7d4af85d71d64885ea903ac234a09bffda /core/import-divinglog.c
parent7c9f46acd202121e67557bb634961ef17a9f6c1f (diff)
downloadsubsurface-8df3705152aa32d8551b5fb7db08e0c8e442b480.tar.gz
Cleanup: return cylinder from cylinder_start() in parser
Most callers of this function accessed the newly generated cylinder immediately after calling this function. Thus, for convenience, return the added cylinder. This avoids a number of verbose expressions. On the flip side, cylinder_start() now has to be cast to function returning void in a the "nesting" function table. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/import-divinglog.c')
-rw-r--r--core/import-divinglog.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/import-divinglog.c b/core/import-divinglog.c
index cd122c40a..5b9e4be3b 100644
--- a/core/import-divinglog.c
+++ b/core/import-divinglog.c
@@ -26,8 +26,7 @@ static int divinglog_cylinder(void *param, int columns, char **data, char **colu
if (data[7] && atoi(data[7]) > 0)
dbl = 2;
- cylinder_start(state);
- cyl = &state->cur_dive->cylinders.cylinders[state->cur_dive->cylinders.nr - 1];
+ cyl = cylinder_start(state);
/*
* Assuming that we have to double the cylinder size, if double