diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-11-03 23:08:32 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-12-05 10:14:25 -0800 |
| commit | dc67876c7955b21f969545eee6f3ae3bdb550787 (patch) | |
| tree | ea9fd130fa10807410a7376799f03f46a2fbc64b /core | |
| parent | 92b833a7d85f7d361f2b198782bb093c300ed59a (diff) | |
| download | subsurface-dc67876c7955b21f969545eee6f3ae3bdb550787.tar.gz | |
Cleanup: introduce empty_weightsystem constant
To make things more future-proof, introduce an empty_weightsystem
constant. Replace explicit aggragate initialization of empty
weightsystems by this constant.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/equipment.h | 2 | ||||
| -rw-r--r-- | core/parse.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/equipment.h b/core/equipment.h index 687e794a5..2711d7703 100644 --- a/core/equipment.h +++ b/core/equipment.h @@ -50,6 +50,8 @@ typedef struct const char *description; /* "integrated", "belt", "ankle" */ } weightsystem_t; +static const weightsystem_t empty_weightsystem = { { 0 }, 0 }; + /* Table of weightsystems. Attention: this stores weightsystems, * *not* pointers * to weightsystems. This has two crucial * consequences: diff --git a/core/parse.c b/core/parse.c index 30d6a8ad5..56e5928fc 100644 --- a/core/parse.c +++ b/core/parse.c @@ -298,8 +298,7 @@ void cylinder_end(struct parser_state *state) void ws_start(struct parser_state *state) { - weightsystem_t w = { {0}, "" }; - add_cloned_weightsystem(&state->cur_dive->weightsystems, w); + add_cloned_weightsystem(&state->cur_dive->weightsystems, empty_weightsystem); } void ws_end(struct parser_state *state) |