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/import-divinglog.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/import-divinglog.c')
| -rw-r--r-- | core/import-divinglog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/import-divinglog.c b/core/import-divinglog.c index 6051cc8bd..d29770080 100644 --- a/core/import-divinglog.c +++ b/core/import-divinglog.c @@ -311,8 +311,8 @@ static int divinglog_dive(void *param, int columns, char **data, char **column) state->cur_dive->watertemp.mkelvin = C_to_mkelvin(atol(data[9])); if (data[10]) { - state->cur_dive->weightsystem[0].weight.grams = atol(data[10]) * 1000; - state->cur_dive->weightsystem[0].description = strdup(translate("gettextFromC", "unknown")); + weightsystem_t ws = { { atol(data[10]) * 1000 }, translate("gettextFromC", "unknown") }; + add_cloned_weightsystem(&state->cur_dive->weightsystems, ws); } if (data[11]) |