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

Cleanup: return cylinder from cylinder_start() in parser

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2019-08-04 18:59:14 +02:00 • committed by Dirk Hohndel
parent 7c9f46acd2
commit 8df3705152
7 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/import-cobalt.c
View file

@ -39,8 +39,7 @@ static int cobalt_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[0])
cyl->gasmix.o2.permille = atoi(data[0]) * 10;
if (data[1])