diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-06-26 17:21:03 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-07-18 06:01:07 -0700 |
| commit | a5e7f4253ac98ad18354973fda7049e9daaea8eb (patch) | |
| tree | 16b95a18d0a1af296e4645d6b7a204b5b325ff01 /core/parse.c | |
| parent | efdb3503eadd7e47cb64b1c252e50488d2e9d0fe (diff) | |
| download | subsurface-a5e7f4253ac98ad18354973fda7049e9daaea8eb.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/parse.c')
| -rw-r--r-- | core/parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
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++; } /* |