From 6fd663f9b39cd60c7381ab16c798f68530194f2b Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 16 Oct 2018 07:57:03 +0200 Subject: Core: use free_dc_contents() in delete_current_divecomputer() delete_current_divecomputer() had some duplicate code to release dive-computer resources. Use the free_dc_contents() function instead. Signed-off-by: Berthold Stoeger --- core/dive.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/dive.c b/core/dive.c index 0912f0388..08ef5b6bd 100644 --- a/core/dive.c +++ b/core/dive.c @@ -4157,11 +4157,7 @@ void delete_current_divecomputer(void) /* remove the first one, so copy the second one in place of the first and free the second one * be careful about freeing the no longer needed structures - since we copy things around we can't use free_dc()*/ struct divecomputer *fdc = dc->next; - free(dc->sample); - free((void *)dc->model); - free((void *)dc->serial); - free((void *)dc->fw_version); - free_events(dc->events); + free_dc_contents(dc); memcpy(dc, fdc, sizeof(struct divecomputer)); free(fdc); } else { -- cgit v1.2.3-70-g09d2