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/uemis-downloader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/uemis-downloader.c') diff --git a/core/uemis-downloader.c b/core/uemis-downloader.c index 83f37545b..5ad6b92be 100644 --- a/core/uemis-downloader.c +++ b/core/uemis-downloader.c @@ -194,7 +194,7 @@ static void uemis_get_weight(char *buffer, weightsystem_t *weight, int diveid) weight->weight.grams = uemis_get_weight_unit(diveid) ? lbs_to_grams(ascii_strtod(buffer, NULL)) : lrint(ascii_strtod(buffer, NULL) * 1000); - weight->description = strdup(translate("gettextFromC", "unknown")); + weight->description = translate("gettextFromC", "unknown"); } static struct dive *uemis_start_dive(uint32_t deviceid) @@ -815,7 +815,9 @@ static void parse_tag(struct dive *dive, char *tag, char *val) } else if (!strcmp(tag, "altitude")) { uemis_get_index(val, &dive->dc.surface_pressure.mbar); } else if (!strcmp(tag, "f32Weight")) { - uemis_get_weight(val, &dive->weightsystem[0], dive->dc.diveid); + weightsystem_t ws; + uemis_get_weight(val, &ws, dive->dc.diveid); + add_cloned_weightsystem(&dive->weightsystems, ws); } else if (!strcmp(tag, "notes")) { uemis_add_string(val, &dive->notes, " "); } else if (!strcmp(tag, "u8DiveSuit")) { -- cgit v1.2.3-70-g09d2