From ab99ca85f12b92ed55219c82ec2220aebfe1dda5 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 3 Nov 2019 23:14:35 +0100 Subject: Cleanup: use free_weightsystem function instead of explicit free Instead of freeing internal data of the weightsystem structure, call the free_weightsystem function (which has to be made extern at first). This makes things more future-proof, should the weightsystem struct ever be extended. Signed-off-by: Berthold Stoeger --- core/equipment.c | 8 ++++++-- core/equipment.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/equipment.c b/core/equipment.c index bd1a0b4e3..e7ac327fd 100644 --- a/core/equipment.c +++ b/core/equipment.c @@ -19,9 +19,13 @@ #include "subsurface-string.h" #include "table.h" -static void free_weightsystem(weightsystem_t w) +/* Warning: this has strange semantics for C-code! Not the weightsystem object + * is freed, but the data it references. The object itself is passed in by value. + * This is due to the fact how the table macros work. + */ +void free_weightsystem(weightsystem_t ws) { - free((void *)w.description); + free((void *)ws.description); } static void free_cylinder(cylinder_t c) diff --git a/core/equipment.h b/core/equipment.h index 2711d7703..77fd9c430 100644 --- a/core/equipment.h +++ b/core/equipment.h @@ -70,6 +70,7 @@ struct weightsystem_table { extern int cylinderuse_from_text(const char *text); extern void copy_weights(const struct weightsystem_table *s, struct weightsystem_table *d); extern weightsystem_t clone_weightsystem(weightsystem_t ws); +extern void free_weightsystem(weightsystem_t ws); extern void copy_cylinder_types(const struct dive *s, struct dive *d); extern void add_cloned_weightsystem(struct weightsystem_table *t, weightsystem_t ws); extern cylinder_t *add_empty_cylinder(struct cylinder_table *t); -- cgit v1.2.3-70-g09d2