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/save-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/save-xml.c')
| -rw-r--r-- | core/save-xml.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/save-xml.c b/core/save-xml.c index 7e2328e5c..fea2b1430 100644 --- a/core/save-xml.c +++ b/core/save-xml.c @@ -127,10 +127,10 @@ static void save_overview(struct membuffer *b, struct dive *dive) show_utf8(b, dive->suit, " <suit>", "</suit>\n", 0); } -static void put_gasmix(struct membuffer *b, struct gasmix *mix) +static void put_gasmix(struct membuffer *b, struct gasmix mix) { - int o2 = mix->o2.permille; - int he = mix->he.permille; + int o2 = mix.o2.permille; + int he = mix.he.permille; if (o2) { put_format(b, " o2='%u.%u%%'", FRACTION(o2, 10)); @@ -155,7 +155,7 @@ static void save_cylinder_info(struct membuffer *b, struct dive *dive) put_milli(b, " size='", volume, " l'"); put_pressure(b, cylinder->type.workingpressure, " workpressure='", " bar'"); show_utf8(b, description, " description='", "'", 1); - put_gasmix(b, &cylinder->gasmix); + put_gasmix(b, cylinder->gasmix); put_pressure(b, cylinder->start, " start='", " bar'"); put_pressure(b, cylinder->end, " end='", " bar'"); if (cylinder->cylinder_use != OC_GAS) @@ -310,7 +310,7 @@ static void save_one_event(struct membuffer *b, struct dive *dive, struct event struct gasmix mix = get_gasmix_from_event(dive, ev); if (ev->gas.index >= 0) show_integer(b, ev->gas.index, "cylinder='", "'"); - put_gasmix(b, &mix); + put_gasmix(b, mix); } put_format(b, " />\n"); } |