From a5e7f4253ac98ad18354973fda7049e9daaea8eb Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 26 Jun 2019 17:21:03 +0200 Subject: Core: dynamically resize weight table Replace the fixed-size weightsystem table by a dynamically relocated table. Reuse the table-macros used in other parts of the code. The table stores weightsystem entries, not pointers to weightsystems. Thus, ownership of the description string is taken when adding a weightsystem. An extra function adds a cloned weightsystem at the end of the table. Signed-off-by: Berthold Stoeger --- core/parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/parse.c') diff --git a/core/parse.c b/core/parse.c index 0581ace00..e33ced85b 100644 --- a/core/parse.c +++ b/core/parse.c @@ -257,7 +257,6 @@ void dive_end(struct parser_state *state) state->cur_location.lat.udeg = 0; state->cur_location.lon.udeg = 0; state->cur_cylinder_index = 0; - state->cur_ws_index = 0; } void trip_start(struct parser_state *state) @@ -299,11 +298,12 @@ void cylinder_end(struct parser_state *state) void ws_start(struct parser_state *state) { + weightsystem_t w = { {0}, "" }; + add_cloned_weightsystem(&state->cur_dive->weightsystems, w); } void ws_end(struct parser_state *state) { - state->cur_ws_index++; } /* -- cgit v1.2.3-70-g09d2