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 /smtk-import | |
| 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 'smtk-import')
| -rw-r--r-- | smtk-import/smartrak.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/smtk-import/smartrak.c b/smtk-import/smartrak.c index 826ad6a9d..acc43e4f0 100644 --- a/smtk-import/smartrak.c +++ b/smtk-import/smartrak.c @@ -506,16 +506,16 @@ static void merge_cylinder_type(cylinder_type_t *src, cylinder_type_t *dst) } } -static void merge_cylinder_mix(struct gasmix *src, struct gasmix *dst) +static void merge_cylinder_mix(struct gasmix src, struct gasmix *dst) { if (!dst->o2.permille) - *dst = *src; + *dst = src; } static void merge_cylinder_info(cylinder_t *src, cylinder_t *dst) { merge_cylinder_type(&src->type, &dst->type); - merge_cylinder_mix(&src->gasmix, &dst->gasmix); + merge_cylinder_mix(src->gasmix, &dst->gasmix); MERGE_MAX(dst, dst, src, start.mbar); MERGE_MIN(dst, dst, src, end.mbar); if (!dst->cylinder_use) |