diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-04 18:59:14 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-09 19:19:04 +0100 |
| commit | 8df3705152aa32d8551b5fb7db08e0c8e442b480 (patch) | |
| tree | 60879e7d4af85d71d64885ea903ac234a09bffda /core/import-suunto.c | |
| parent | 7c9f46acd202121e67557bb634961ef17a9f6c1f (diff) | |
| download | subsurface-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-suunto.c')
| -rw-r--r-- | core/import-suunto.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/import-suunto.c b/core/import-suunto.c index 408128cb7..d34c01442 100644 --- a/core/import-suunto.c +++ b/core/import-suunto.c @@ -218,8 +218,7 @@ static int dm4_dive(void *param, int columns, char **data, char **column) /* * TODO: handle multiple cylinders */ - cylinder_start(state); - cyl = &state->cur_dive->cylinders.cylinders[state->cur_dive->cylinders.nr - 1]; + cyl = cylinder_start(state); if (data[22] && atoi(data[22]) > 0) cyl->start.mbar = atoi(data[22]); else if (data[10] && atoi(data[10]) > 0) @@ -328,8 +327,7 @@ static int dm5_cylinders(void *param, int columns, char **data, char **column) struct parser_state *state = (struct parser_state *)param; cylinder_t *cyl; - cylinder_start(state); - cyl = &state->cur_dive->cylinders.cylinders[state->cur_dive->cylinders.nr - 1]; + cyl = cylinder_start(state); if (data[7] && atoi(data[7]) > 0 && atoi(data[7]) < 350000) cyl->start.mbar = atoi(data[7]); if (data[8] && atoi(data[8]) > 0 && atoi(data[8]) < 350000) |