diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-08-16 19:10:10 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-23 05:16:38 -0700 |
| commit | 360f07e4533d4ede7ba494724382fc8dbcb4649c (patch) | |
| tree | 73a222ad3469e8a7fd085cb2671d12dac664aeac /core/parse-xml.c | |
| parent | 5c4569247a31cf9f52238bd2b3f9c87b8f79933a (diff) | |
| download | subsurface-360f07e4533d4ede7ba494724382fc8dbcb4649c.tar.gz | |
Cleanup: pass gasmix by value
In a previous commit, the get_gasmix_* functions were changed to
return by value. For consistency, also pass gasmix by value.
Note that on common 64-bit platforms struct gasmix is the size
of a pointer [2 * 32 bit vs. 64 bit] and therefore uses the
same space on the stack. On 32-bit platforms, the stack use
is probably doubled, but in return a dereference is avoided.
Supporting arbitrary gas-mixes (H2, Ar, ...) will be such an
invasive change that going back to pointers is probably the
least of our worries.
This commit is a step in const-ifying input parameters (passing
by value is the ultimate way of signaling that the input parameter
will not be changed [unless there are references to said parameter]).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/parse-xml.c')
| -rw-r--r-- | core/parse-xml.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c index ae779e1f8..681d05aa9 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -652,7 +652,7 @@ void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int second if (idx < 0 || idx >= MAX_CYLINDERS) return; /* The gas switch event format is insane for historical reasons */ - struct gasmix *mix = &dive->cylinder[idx].gasmix; + struct gasmix mix = dive->cylinder[idx].gasmix; int o2 = get_o2(mix); int he = get_he(mix); struct event *ev; @@ -665,7 +665,7 @@ void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int second ev = add_event(dc, seconds, he ? SAMPLE_EVENT_GASCHANGE2 : SAMPLE_EVENT_GASCHANGE, 0, value, "gaschange"); if (ev) { ev->gas.index = idx; - ev->gas.mix = *mix; + ev->gas.mix = mix; } } |