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 --- smtk-import/smartrak.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'smtk-import') diff --git a/smtk-import/smartrak.c b/smtk-import/smartrak.c index 64c6d8e5f..1787d3fb7 100644 --- a/smtk-import/smartrak.c +++ b/smtk-import/smartrak.c @@ -1063,7 +1063,8 @@ void smartrak_import(const char *file, struct dive_table *divetable) /* No DC related data */ smtkdive->visibility = strtod(col[coln(VISIBILITY)]->bind_ptr, NULL) > 25 ? 5 : lrint(strtod(col[13]->bind_ptr, NULL) / 5); - smtkdive->weightsystem[0].weight.grams = lrint(strtod(col[coln(WEIGHT)]->bind_ptr, NULL) * 1000); + weightsystem_t ws = { {lrint(strtod(col[coln(WEIGHT)]->bind_ptr, NULL) * 1000)}, "" }; + add_cloned_weightsystem(&smtkdive->weightsystems, ws); smtkdive->suit = copy_string(suit_list[atoi(col[coln(SUITIDX)]->bind_ptr) - 1]); smtk_build_location(mdb_clon, col[coln(SITEIDX)]->bind_ptr, &smtkdive->dive_site); smtkdive->buddy = smtk_locate_buddy(mdb_clon, col[0]->bind_ptr, buddy_list); -- cgit v1.2.3-70-g09d2